annotate src/xdisp.c @ 26255:4ebced8747b7

(append_space): Return non-zero if space was appended. (display_line): Set charpos of first glyph to -1 only if that glyph is the space added by append_glyph.
author Gerd Moellmann <gerd@gnu.org>
date Sun, 31 Oct 1999 02:01:25 +0000
parents 47d54b67bce2
children 4ca4f3f6c4a0
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.
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 97, 98, 99
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3 Free Software Foundation, Inc.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5 This file is part of GNU Emacs.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 GNU Emacs is free software; you can redistribute it and/or modify
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8 it under the terms of the GNU General Public License as published by
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9 the Free Software Foundation; either version 2, or (at your option)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 any later version.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 GNU Emacs is distributed in the hope that it will be useful,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 GNU General Public License for more details.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 along with GNU Emacs; see the file COPYING. If not, write to
14186
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14178
diff changeset
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 14178
diff changeset
20 Boston, MA 02111-1307, USA. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
22 /* New redisplay written by Gerd Moellmann <gerd@gnu.org>.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
23
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
24 Redisplay.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
25
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
26 Emacs separates the task of updating the display from code
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
27 modifying global state, e.g. buffer text. This way functions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
28 operating on buffers don't also have to be concerned with updating
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
29 the display.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
30
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
31 Updating the display is triggered by the Lisp interpreter when it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
32 decides it's time to do it. This is done either automatically for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
33 you as part of the interpreter's command loop or as the result of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
34 calling Lisp functions like `sit-for'. The C function `redisplay'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
35 in xdisp.c is the only entry into the inner redisplay code. (Or,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
36 let's say almost---see the the description of direct update
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
37 operations, below.).
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
38
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
39 The following diagram shows how redisplay code is invoked. As you
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
40 can see, Lisp calls redisplay and vice versa. Under window systems
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
41 like X, some portions of the redisplay code are also called
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
42 asynchronously during mouse movement or expose events. It is very
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
43 important that these code parts do NOT use the C library (malloc,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
44 free) because many C libraries under Unix are not reentrant. They
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
45 may also NOT call functions of the Lisp interpreter which could
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
46 change the interpreter's state. If you don't follow these rules,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
47 you will encounter bugs which are very hard to explain.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
48
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
49 (Direct functions, see below)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
50 direct_output_for_insert,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
51 direct_forward_char (dispnew.c)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
52 +---------------------------------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
53 | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
54 | V
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
55 +--------------+ redisplay() +----------------+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
56 | Lisp machine |---------------->| Redisplay code |<--+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
57 +--------------+ (xdisp.c) +----------------+ |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
58 ^ | |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
59 +----------------------------------+ |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
60 Don't use this path when called |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
61 asynchronously! |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
62 |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
63 expose_window (asynchronous) |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
64 |
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
65 X expose events -----+
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
66
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
67 What does redisplay? Obviously, it has to figure out somehow what
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
68 has been changed since the last time the display has been updated,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
69 and to make these changes visible. Preferably it would do that in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
70 a moderately intelligent way, i.e. fast.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
71
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
72 Changes in buffer text can be deduced from window and buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
73 structures, and from some global variables like `beg_unchanged' and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
74 `end_unchanged'. The contents of the display are additionally
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
75 recorded in a `glyph matrix', a two-dimensional matrix of glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
76 structures. Each row in such a matrix corresponds to a line on the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
77 display, and each glyph in a row corresponds to a column displaying
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
78 a character, an image, or what else. This matrix is called the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
79 `current glyph matrix' or `current matrix' in redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
80 terminology.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
81
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
82 For buffer parts that have been changed since the last update, a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
83 second glyph matrix is constructed, the so called `desired glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
84 matrix' or short `desired matrix'. Current and desired matrix are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
85 then compared to find a cheap way to update the display, e.g. by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
86 reusing part of the display by scrolling lines.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
87
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
88
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
89 Direct operations.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
90
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
91 You will find a lot of of redisplay optimizations when you start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
92 looking at the innards of redisplay. The overall goal of all these
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
93 optimizations is to make redisplay fast because it is done
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
94 frequently.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
95
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
96 Two optimizations are not found in xdisp.c. These are the direct
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
97 operations mentioned above. As the name suggests they follow a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
98 different principle than the rest of redisplay. Instead of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
99 building a desired matrix and then comparing it with the current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
100 display, they perform their actions directly on the display and on
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
101 the current matrix.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
102
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
103 One direct operation updates the display after one character has
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
104 been entered. The other one moves the cursor by one position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
105 forward or backward. You find these functions under the names
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
106 `direct_output_for_insert' and `direct_output_forward_char' in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
107 dispnew.c.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
108
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
109
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
110 Desired matrices.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
111
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
112 Desired matrices are always built per Emacs window. The function
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
113 `display_line' is the central function to look at if you are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
114 interested. It constructs one row in a desired matrix given an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
115 iterator structure containing both a buffer position and a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
116 description of the environment in which the text is to be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
117 displayed. But this is too early, read on.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
118
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
119 Characters and pixmaps displayed for a range of buffer text depend
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
120 on various settings of buffers and windows, on overlays and text
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
121 properties, on display tables, on selective display. The good news
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
122 is that all this hairy stuff is hidden behind a small set of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
123 interface functions taking a iterator structure (struct it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
124 argument.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
125
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
126 Iteration over things to be be displayed is then simple. It is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
127 started by initializing an iterator with a call to init_iterator
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
128 (or init_string_iterator for that matter). Calls to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
129 get_next_display_element fill the iterator structure with relevant
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
130 information about the next thing to display. Calls to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
131 set_iterator_to_next move the iterator to the next thing.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
132
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
133 Besides this, an iterator also contains information about the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
134 display environment in which glyphs for display elements are to be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
135 produced. It has fields for the width and height of the display,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
136 the information whether long lines are truncated or continued, a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
137 current X and Y position, and lots of other stuff you can better
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
138 see in dispextern.h.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
139
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
140 Glyphs in a desired matrix are normally constructed in a loop
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
141 calling get_next_display_element and then produce_glyphs. The call
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
142 to produce_glyphs will fill the iterator structure with pixel
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
143 information about the element being displayed and at the same time
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
144 produce glyphs for it. If the display element fits on the line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
145 being displayed, set_iterator_to_next is called next, otherwise the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
146 glyphs produced are discarded.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
147
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
148
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
149 Frame matrices.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
150
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
151 That just couldn't be all, could it? What about terminal types not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
152 supporting operations on sub-windows of the screen? To update the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
153 display on such a terminal, window-based glyph matrices are not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
154 well suited. To be able to reuse part of the display (scrolling
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
155 lines up and down), we must instead have a view of the whole
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
156 screen. This is what `frame matrices' are for. They are a trick.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
157
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
158 Frames on terminals like above have a glyph pool. Windows on such
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
159 a frame sub-allocate their glyph memory from their frame's glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
160 pool. The frame itself is given its own glyph matrices. By
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
161 coincidence---or maybe something else---rows in window glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
162 matrices are slices of corresponding rows in frame matrices. Thus
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
163 writing to window matrices implicitly updates a frame matrix which
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
164 provides us with the view of the whole screen that we originally
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
165 wanted to have without having to move many bytes around. To be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
166 honest, there is a little bit more done, but not much more. If you
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
167 plan to extend that code, take a look at dispnew.c. The function
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
168 build_frame_matrix is a good starting point. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
169
4696
1fc792473491 Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents: 4423
diff changeset
170 #include <config.h>
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
171 #include <stdio.h>
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
172 #include "lisp.h"
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
173 #include "frame.h"
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
174 #include "window.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
175 #include "termchar.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
176 #include "dispextern.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
177 #include "buffer.h"
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
178 #include "charset.h"
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
179 #include "indent.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
180 #include "commands.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
181 #include "macros.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
182 #include "disptab.h"
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
183 #include "termhooks.h"
4386
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
184 #include "intervals.h"
12081
0d7b62a295be Include keyboard.h.
Karl Heuer <kwzh@gnu.org>
parents: 12022
diff changeset
185 #include "keyboard.h"
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
186 #include "coding.h"
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
187 #include "process.h"
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21478
diff changeset
188 #include "region-cache.h"
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21478
diff changeset
189
21825
697991d2a2c4 Conditionally include xterm.h using HAVE_X_WINDOWS.
Geoff Voelker <voelker@cs.washington.edu>
parents: 21748
diff changeset
190 #ifdef HAVE_X_WINDOWS
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21478
diff changeset
191 #include "xterm.h"
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21478
diff changeset
192 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
193
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
194 #define min(a, b) ((a) < (b) ? (a) : (b))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
195 #define max(a, b) ((a) > (b) ? (a) : (b))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
196
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
197 #define INFINITY 10000000
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
198
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
199 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
200 extern void set_frame_menubar ();
15813
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
201 extern int pending_menu_activation;
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
202 #endif
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
203
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
204 extern int interrupt_input;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
205 extern int command_loop_level;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
206
16660
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
207 extern int minibuffer_auto_raise;
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
208
8471
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
209 extern Lisp_Object Qface;
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
210
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
211 extern Lisp_Object Voverriding_local_map;
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
212 extern Lisp_Object Voverriding_local_map_menu_flag;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
213 extern Lisp_Object Qmenu_item;
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
214
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
215 Lisp_Object Qoverriding_local_map, Qoverriding_terminal_local_map;
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
216 Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
13584
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
217 Lisp_Object Qredisplay_end_trigger_functions;
21748
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
218 Lisp_Object Qinhibit_point_motion_hooks;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
219 Lisp_Object QCeval, Qwhen, QCfile;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
220 Lisp_Object Qfontified;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
221
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
222 /* Functions called to fontify regions of text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
223
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
224 Lisp_Object Vfontification_functions;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
225 Lisp_Object Qfontification_functions;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
226
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
227 /* Non-zero means draw tool bar buttons raised when the mouse moves
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
228 over them. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
229
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
230 int auto_raise_tool_bar_buttons_p;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
231
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
232 /* Margin around tool bar buttons in pixels. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
233
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
234 int tool_bar_button_margin;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
235
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
236 /* Thickness of shadow to draw around tool bar buttons. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
237
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
238 int tool_bar_button_relief;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
239
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
240 /* Non-zero means automatically resize tool-bars so that all tool-bar
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
241 items are visible, and no blank lines remain. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
242
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
243 int auto_resize_tool_bars_p;
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
244
22543
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
245 /* Non-nil means don't actually do any redisplay. */
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
246
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
247 Lisp_Object Vinhibit_redisplay, Qinhibit_redisplay;
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
248
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
249 /* Names of text properties relevant for redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
250
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
251 Lisp_Object Qdisplay, Qrelative_width, Qwidth, Qalign_to;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
252 extern Lisp_Object Qface, Qinvisible, Qimage;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
253
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
254 /* Symbols used in text property values. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
255
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
256 Lisp_Object Qspace, QCalign_to, QCrelative_width, QCrelative_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
257 Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qheight, Qraise;
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
258 Lisp_Object Qmargin;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
259
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
260 /* Non-nil means highlight trailing whitespace. */
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
261
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
262 Lisp_Object Vshow_trailing_whitespace;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
263
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
264 /* Name of the face used to highlight trailing whitespace. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
265
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
266 Lisp_Object Qtrailing_whitespace;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
267
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
268 /* The symbol `image' which is the car of the lists used to represent
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
269 images in Lisp. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
270
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
271 Lisp_Object Qimage;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
272
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
273 /* Non-zero means print newline to stdout before next mini-buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
274 message. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
275
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
276 int noninteractive_need_newline;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
277
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
278 /* Non-zero means print newline to message log before next message. */
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
279
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
280 static int message_log_need_newline;
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
281
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
282
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
283 /* The buffer position of the first character appearing entirely or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
284 partially on the line of the selected window which contains the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
285 cursor; <= 0 if not known. Set by set_cursor_from_row, used for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
286 redisplay optimization in redisplay_internal. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
287
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
288 static struct text_pos this_line_start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
289
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
290 /* Number of characters past the end of the line above, including the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
291 terminating newline. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
292
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
293 static struct text_pos this_line_end_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
294
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
295 /* The vertical positions and the height of this line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
296
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
297 static int this_line_vpos;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
298 static int this_line_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
299 static int this_line_pixel_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
300
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
301 /* X position at which this display line starts. Usually zero;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
302 negative if first character is partially visible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
303
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
304 static int this_line_start_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
305
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
306 /* Buffer that this_line_.* variables are referring to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
307
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
308 static struct buffer *this_line_buffer;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
309
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
310 /* Nonzero means truncate lines in all windows less wide than the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
311 frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
312
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
313 int truncate_partial_width_windows;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
314
24676
ba5632c9721a (display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents: 24557
diff changeset
315 /* A flag to control how to display unibyte 8-bit character. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
316
24676
ba5632c9721a (display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents: 24557
diff changeset
317 int unibyte_display_via_language_environment;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
318
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
319 /* Nonzero means we have more than one non-mini-buffer-only frame.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
320 Not guaranteed to be accurate except while parsing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
321 frame-title-format. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
322
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
323 int multiple_frames;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
324
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
325 Lisp_Object Vglobal_mode_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
326
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
327 /* Marker for where to display an arrow on top of the buffer text. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
328
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
329 Lisp_Object Voverlay_arrow_position;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
330
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
331 /* String to display for the arrow. Only used on terminal frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
332
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
333 Lisp_Object Voverlay_arrow_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
334
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
335 /* Values of those variables at last redisplay. However, if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
336 Voverlay_arrow_position is a marker, last_arrow_position is its
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
337 numerical position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
338
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
339 static Lisp_Object last_arrow_position, last_arrow_string;
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
340
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
341 /* Like mode-line-format, but for the title bar on a visible frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
342
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
343 Lisp_Object Vframe_title_format;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
344
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
345 /* Like mode-line-format, but for the title bar on an iconified frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
346
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
347 Lisp_Object Vicon_title_format;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
348
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
349 /* List of functions to call when a window's size changes. These
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
350 functions get one arg, a frame on which one or more windows' sizes
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
351 have changed. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
352
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
353 static Lisp_Object Vwindow_size_change_functions;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
354
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
355 Lisp_Object Qmenu_bar_update_hook;
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
356
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
357 /* Nonzero if overlay arrow has been displayed once in this window. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
358
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
359 static int overlay_arrow_seen;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
360
3265
80f57ae8d44e (syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 3165
diff changeset
361 /* Nonzero means highlight the region even in nonselected windows. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
362
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
363 int highlight_nonselected_windows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
364
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
365 /* If cursor motion alone moves point off frame, try scrolling this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
366 many lines up or down if that will bring it back. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
367
11719
9238e21a6f09 (prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents: 11649
diff changeset
368 static int scroll_step;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
369
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
370 /* Non-0 means scroll just far enough to bring point back on the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
371 screen, when appropriate. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
372
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
373 static int scroll_conservatively;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
374
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
375 /* Recenter the window whenever point gets within this many lines of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
376 the top or bottom of the window. This value is translated into a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
377 pixel value by multiplying it with CANON_Y_UNIT, which means that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
378 there is really a fixed pixel height scroll margin. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
379
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
380 int scroll_margin;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
381
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
382 /* Number of windows showing the buffer of the selected window (or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
383 another buffer with the same base buffer). keyboard.c refers to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
384 this. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
385
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
386 int buffer_shared;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
387
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
388 /* Vector containing glyphs for an ellipsis `...'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
389
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
390 static Lisp_Object default_invis_vector[3];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
391
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
392 /* Nonzero means display mode line highlighted. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
393
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
394 int mode_line_inverse_video;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
395
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
396 /* Prompt to display in front of the mini-buffer contents. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
397
7951
e609577aa2f3 minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents: 7933
diff changeset
398 Lisp_Object minibuf_prompt;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
399
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
400 /* Width of current mini-buffer prompt. Only set after display_line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
401 of the line that contains the prompt. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
402
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
403 int minibuf_prompt_width;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
404 int minibuf_prompt_pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
405
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
406 /* This is the window where the echo area message was displayed. It
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
407 is always a mini-buffer window, but it may not be the same window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
408 currently active as a mini-buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
409
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
410 Lisp_Object echo_area_window;
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
411
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
412 /* List of pairs (MESSAGE . MULTIBYTE). The function save_message
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
413 pushes the current message and the value of
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
414 message_enable_multibyte on the stack, the function restore_message
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
415 pops the stack and displays MESSAGE again. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
416
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
417 Lisp_Object Vmessage_stack;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
418
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
419 /* Nonzero means multibyte characters were enabled when the echo area
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
420 message was specified. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
421
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
422 int message_enable_multibyte;
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
423
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
424 /* True if we should redraw the mode lines on the next redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
425
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
426 int update_mode_lines;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
427
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
428 /* Nonzero if window sizes or contents have changed since last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
429 redisplay that finished */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
430
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
431 int windows_or_buffers_changed;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
432
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
433 /* Nonzero after display_mode_line if %l was used and it displayed a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
434 line number. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
435
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
436 int line_number_displayed;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
437
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
438 /* Maximum buffer size for which to display line numbers. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
439
11719
9238e21a6f09 (prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents: 11649
diff changeset
440 static int line_number_display_limit;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
441
25258
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
442 /* line width to consider when repostioning for line number display */
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
443
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
444 static int line_number_display_limit_width;
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
445
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
446 /* Number of lines to keep in the message log buffer. t means
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
447 infinite. nil means don't log at all. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
448
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
449 Lisp_Object Vmessage_log_max;
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
450
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
451 /* Current, index 0, and last displayed echo area message. Either
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
452 buffers from echo_buffers, or nil to indicate no message. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
453
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
454 Lisp_Object echo_area_buffer[2];
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
455
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
456 /* The buffers referenced from echo_area_buffer. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
457
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
458 static Lisp_Object echo_buffer[2];
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
459
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
460 /* A vector saved used in with_area_buffer to reduce consing. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
461
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
462 static Lisp_Object Vwith_echo_area_save_vector;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
463
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
464 /* Non-zero means display_echo_area should display the last echo area
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
465 message again. Set by redisplay_preserve_echo_area. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
466
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
467 static int display_last_displayed_message_p;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
468
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
469 /* Nonzero if echo area is being used by print; zero if being used by
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
470 message. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
471
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
472 int message_buf_print;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
473
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
474 /* Maximum height for resizing mini-windows. Either a float
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
475 specifying a fraction of the available height, or an integer
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
476 specifying a number of lines. */
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
477
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
478 static Lisp_Object Vmax_mini_window_height;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
479
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
480 /* A scratch glyph row with contents used for generating truncation
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
481 glyphs. Also used in direct_output_for_insert. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
482
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
483 #define MAX_SCRATCH_GLYPHS 100
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
484 struct glyph_row scratch_glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
485 static struct glyph scratch_glyphs[MAX_SCRATCH_GLYPHS];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
486
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
487 /* Ascent and height of the last line processed by move_it_to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
488
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
489 static int last_max_ascent, last_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
490
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
491 /* The maximum distance to look ahead for text properties. Values
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
492 that are too small let us call compute_char_face and similar
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
493 functions too often which is expensive. Values that are too large
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
494 let us call compute_char_face and alike too often because we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
495 might not be interested in text properties that far away. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
496
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
497 #define TEXT_PROP_DISTANCE_LIMIT 100
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
498
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
499 /* Non-zero means print traces of redisplay if compiled with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
500 GLYPH_DEBUG != 0. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
501
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
502 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
503 int trace_redisplay_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
504 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
505
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
506 /* Value returned from text property handlers (see below). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
507
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
508 enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
509 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
510 HANDLED_NORMALLY,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
511 HANDLED_RECOMPUTE_PROPS,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
512 HANDLED_OVERLAY_STRING_CONSUMED,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
513 HANDLED_RETURN
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
514 };
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
515
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
516 /* A description of text properties that redisplay is interested
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
517 in. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
518
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
519 struct props
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
520 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
521 /* The name of the property. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
522 Lisp_Object *name;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
523
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
524 /* A unique index for the property. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
525 enum prop_idx idx;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
526
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
527 /* A handler function called to set up iterator IT from the property
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
528 at IT's current position. Value is used to steer handle_stop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
529 enum prop_handled (*handler) P_ ((struct it *it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
530 };
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
531
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
532 static enum prop_handled handle_face_prop P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
533 static enum prop_handled handle_invisible_prop P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
534 static enum prop_handled handle_display_prop P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
535 static enum prop_handled handle_overlay_change P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
536 static enum prop_handled handle_fontified_prop P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
537
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
538 /* Properties handled by iterators. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
539
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
540 static struct props it_props[] =
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
541 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
542 {&Qfontified, FONTIFIED_PROP_IDX, handle_fontified_prop},
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
543 /* Handle `face' before `display' because some sub-properties of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
544 `display' need to know the face. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
545 {&Qface, FACE_PROP_IDX, handle_face_prop},
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
546 {&Qdisplay, DISPLAY_PROP_IDX, handle_display_prop},
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
547 {&Qinvisible, INVISIBLE_PROP_IDX, handle_invisible_prop},
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
548 {NULL, 0, NULL}
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
549 };
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
550
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
551 /* Value is the position described by X. If X is a marker, value is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
552 the marker_position of X. Otherwise, value is X. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
553
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
554 #define COERCE_MARKER(X) (MARKERP ((X)) ? Fmarker_position (X) : (X))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
555
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
556 /* Enumeration returned by some move_it_.* functions internally. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
557
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
558 enum move_it_result
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
559 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
560 /* Not used. Undefined value. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
561 MOVE_UNDEFINED,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
562
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
563 /* Move ended at the requested buffer position or ZV. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
564 MOVE_POS_MATCH_OR_ZV,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
565
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
566 /* Move ended at the requested X pixel position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
567 MOVE_X_REACHED,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
568
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
569 /* Move within a line ended at the end of a line that must be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
570 continued. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
571 MOVE_LINE_CONTINUED,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
572
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
573 /* Move within a line ended at the end of a line that would
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
574 be displayed truncated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
575 MOVE_LINE_TRUNCATED,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
576
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
577 /* Move within a line ended at a line end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
578 MOVE_NEWLINE_OR_CR
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
579 };
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
580
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
581
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
582
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
583 /* Function prototypes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
584
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
585 static struct glyph_row *row_containing_pos P_ ((struct window *, int,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
586 struct glyph_row *,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
587 struct glyph_row *));
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
588 static Lisp_Object unwind_with_echo_area_buffer P_ ((Lisp_Object));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
589 static Lisp_Object with_echo_area_buffer_unwind_data P_ ((struct window *));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
590 static void clear_garbaged_frames P_ ((void));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
591 static int current_message_1 P_ ((Lisp_Object *));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
592 static int truncate_message_1 P_ ((int));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
593 static int set_message_1 P_ ((char *s, Lisp_Object, int, int));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
594 static int display_echo_area P_ ((struct window *));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
595 static int display_echo_area_1 P_ ((struct window *));
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
596 static Lisp_Object unwind_redisplay P_ ((Lisp_Object));
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
597 static int string_char_and_length P_ ((unsigned char *, int, int *));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
598 static struct text_pos display_prop_end P_ ((struct it *, Lisp_Object,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
599 struct text_pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
600 static int compute_window_start_on_continuation_line P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
601 static Lisp_Object eval_handler P_ ((Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
602 static Lisp_Object eval_form P_ ((Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
603 static void insert_left_trunc_glyphs P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
604 static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
605 static void extend_face_to_end_of_line P_ ((struct it *));
26255
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
606 static int append_space P_ ((struct it *, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
607 static void make_cursor_line_fully_visible P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
608 static int try_scrolling P_ ((Lisp_Object, int, int, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
609 static int trailing_whitespace_p P_ ((int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
610 static int message_log_check_duplicate P_ ((int, int, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
611 int invisible_p P_ ((Lisp_Object, Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
612 int invisible_ellipsis_p P_ ((Lisp_Object, Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
613 static void push_it P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
614 static void pop_it P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
615 static void sync_frame_with_window_matrix_rows P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
616 static void redisplay_internal P_ ((int));
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
617 static int echo_area_display P_ ((int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
618 static void redisplay_windows P_ ((Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
619 static void redisplay_window P_ ((Lisp_Object, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
620 static void update_menu_bar P_ ((struct frame *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
621 static int try_window_reusing_current_matrix P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
622 static int try_window_id P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
623 static int display_line P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
624 static void display_mode_lines P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
625 static void display_mode_line P_ ((struct window *, enum face_id,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
626 Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
627 static int display_mode_element P_ ((struct it *, int, int, int, Lisp_Object));
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26018
diff changeset
628 static char *decode_mode_spec P_ ((struct window *, int, int, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
629 static void display_menu_bar P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
630 static int display_count_lines P_ ((int, int, int, int, int *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
631 static int display_string P_ ((unsigned char *, Lisp_Object, Lisp_Object,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
632 int, int, struct it *, int, int, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
633 static void compute_line_metrics P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
634 static void run_redisplay_end_trigger_hook P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
635 static int get_overlay_strings P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
636 static void next_overlay_string P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
637 void set_iterator_to_next P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
638 static void reseat P_ ((struct it *, struct text_pos, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
639 static void reseat_1 P_ ((struct it *, struct text_pos, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
640 static void back_to_previous_visible_line_start P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
641 static void reseat_at_previous_visible_line_start P_ ((struct it *));
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
642 static void reseat_at_next_visible_line_start P_ ((struct it *, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
643 static int next_element_from_display_vector P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
644 static int next_element_from_string P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
645 static int next_element_from_c_string P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
646 static int next_element_from_buffer P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
647 static int next_element_from_image P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
648 static int next_element_from_stretch P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
649 static void load_overlay_strings P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
650 static void init_from_display_pos P_ ((struct it *, struct window *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
651 struct display_pos *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
652 static void reseat_to_string P_ ((struct it *, unsigned char *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
653 Lisp_Object, int, int, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
654 static int charset_at_position P_ ((struct text_pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
655 static enum move_it_result move_it_in_display_line_to P_ ((struct it *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
656 int, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
657 void move_it_vertically_backward P_ ((struct it *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
658 static void init_to_row_start P_ ((struct it *, struct window *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
659 struct glyph_row *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
660 static void init_to_row_end P_ ((struct it *, struct window *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
661 struct glyph_row *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
662 static void back_to_previous_line_start P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
663 static void forward_to_next_line_start P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
664 static struct text_pos string_pos_nchars_ahead P_ ((struct text_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
665 Lisp_Object, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
666 static struct text_pos string_pos P_ ((int, Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
667 static struct text_pos c_string_pos P_ ((int, unsigned char *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
668 static int number_of_chars P_ ((unsigned char *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
669 static void compute_stop_pos P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
670 static void compute_string_pos P_ ((struct text_pos *, struct text_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
671 Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
672 static int face_before_or_after_it_pos P_ ((struct it *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
673 static int next_overlay_change P_ ((int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
674 static int handle_single_display_prop P_ ((struct it *, Lisp_Object,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
675 Lisp_Object, struct text_pos *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
676
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
677 #define face_before_it_pos(IT) face_before_or_after_it_pos ((IT), 1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
678 #define face_after_it_pos(IT) face_before_or_after_it_pos ((IT), 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
679
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
680 #ifdef HAVE_WINDOW_SYSTEM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
681
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
682 static void update_tool_bar P_ ((struct frame *, int));
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
683 static void build_desired_tool_bar_string P_ ((struct frame *f));
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
684 static int redisplay_tool_bar P_ ((struct frame *));
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
685 static void display_tool_bar_line P_ ((struct it *));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
686
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
687 #endif /* HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
688
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
689
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
690 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
691 Window display dimensions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
692 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
693
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
694 /* Return the window-relative maximum y + 1 for glyph rows displaying
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
695 text in window W. This is the height of W minus the height of a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
696 mode line, if any. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
697
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
698 INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
699 window_text_bottom_y (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
700 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
701 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
702 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
703 int height = XFASTINT (w->height) * CANON_Y_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
704
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
705 if (WINDOW_WANTS_MODELINE_P (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
706 height -= CURRENT_MODE_LINE_HEIGHT (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
707 return height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
708 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
709
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
710
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
711 /* Return the pixel width of display area AREA of window W. AREA < 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
712 means return the total width of W, not including bitmap areas to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
713 the left and right of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
714
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
715 INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
716 window_box_width (w, area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
717 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
718 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
719 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
720 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
721 int width = XFASTINT (w->width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
722
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
723 if (!w->pseudo_window_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
724 {
25463
255017b70168 (window_box_width): Use FRAME_FLAGS_AREA_COLS instead of
Gerd Moellmann <gerd@gnu.org>
parents: 25403
diff changeset
725 width -= FRAME_SCROLL_BAR_WIDTH (f) + FRAME_FLAGS_AREA_COLS (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
726
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
727 if (area == TEXT_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
728 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
729 if (INTEGERP (w->left_margin_width))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
730 width -= XFASTINT (w->left_margin_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
731 if (INTEGERP (w->right_margin_width))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
732 width -= XFASTINT (w->right_margin_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
733 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
734 else if (area == LEFT_MARGIN_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
735 width = (INTEGERP (w->left_margin_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
736 ? XFASTINT (w->left_margin_width) : 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
737 else if (area == RIGHT_MARGIN_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
738 width = (INTEGERP (w->right_margin_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
739 ? XFASTINT (w->right_margin_width) : 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
740 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
741
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
742 return width * CANON_X_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
743 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
744
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
745
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
746 /* Return the pixel height of the display area of window W, not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
747 including mode lines of W, if any.. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
748
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
749 INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
750 window_box_height (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
751 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
752 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
753 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
754 int height = XFASTINT (w->height) * CANON_Y_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
755
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
756 if (WINDOW_WANTS_MODELINE_P (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
757 height -= CURRENT_MODE_LINE_HEIGHT (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
758
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
759 if (WINDOW_WANTS_HEADER_LINE_P (w))
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
760 height -= CURRENT_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
761
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
762 return height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
763 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
764
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
765
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
766 /* Return the frame-relative coordinate of the left edge of display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
767 area AREA of window W. AREA < 0 means return the left edge of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
768 whole window, to the right of any bitmap area at the left side of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
769 W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
770
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
771 INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
772 window_box_left (w, area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
773 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
774 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
775 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
776 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
777 int x = FRAME_INTERNAL_BORDER_WIDTH_SAFE (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
778
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
779 if (!w->pseudo_window_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
780 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
781 x += (WINDOW_LEFT_MARGIN (w) * CANON_X_UNIT (f)
25463
255017b70168 (window_box_width): Use FRAME_FLAGS_AREA_COLS instead of
Gerd Moellmann <gerd@gnu.org>
parents: 25403
diff changeset
782 + FRAME_LEFT_FLAGS_AREA_WIDTH (f));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
783
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
784 if (area == TEXT_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
785 x += window_box_width (w, LEFT_MARGIN_AREA);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
786 else if (area == RIGHT_MARGIN_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
787 x += (window_box_width (w, LEFT_MARGIN_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
788 + window_box_width (w, TEXT_AREA));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
789 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
790
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
791 return x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
792 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
793
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
794
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
795 /* Return the frame-relative coordinate of the right edge of display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
796 area AREA of window W. AREA < 0 means return the left edge of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
797 whole window, to the left of any bitmap area at the right side of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
798 W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
799
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
800 INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
801 window_box_right (w, area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
802 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
803 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
804 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
805 return window_box_left (w, area) + window_box_width (w, area);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
806 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
807
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
808
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
809 /* Get the bounding box of the display area AREA of window W, without
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
810 mode lines, in frame-relative coordinates. AREA < 0 means the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
811 whole window, not including bitmap areas to the left and right of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
812 the window. Return in *BOX_X and *BOX_Y the frame-relative pixel
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
813 coordinates of the upper-left corner of the box. Return in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
814 *BOX_WIDTH, and *BOX_HEIGHT the pixel width and height of the box. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
815
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
816 INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
817 window_box (w, area, box_x, box_y, box_width, box_height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
818 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
819 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
820 int *box_x, *box_y, *box_width, *box_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
821 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
822 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
823
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
824 *box_width = window_box_width (w, area);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
825 *box_height = window_box_height (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
826 *box_x = window_box_left (w, area);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
827 *box_y = (FRAME_INTERNAL_BORDER_WIDTH_SAFE (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
828 + XFASTINT (w->top) * CANON_Y_UNIT (f));
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
829 if (WINDOW_WANTS_HEADER_LINE_P (w))
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
830 *box_y += CURRENT_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
831 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
832
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
833
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
834 /* Get the bounding box of the display area AREA of window W, without
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
835 mode lines. AREA < 0 means the whole window, not including bitmap
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
836 areas to the left and right of the window. Return in *TOP_LEFT_X
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
837 and TOP_LEFT_Y the frame-relative pixel coordinates of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
838 upper-left corner of the box. Return in *BOTTOM_RIGHT_X, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
839 *BOTTOM_RIGHT_Y the coordinates of the bottom-right corner of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
840 box. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
841
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
842 INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
843 window_box_edges (w, area, top_left_x, top_left_y,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
844 bottom_right_x, bottom_right_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
845 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
846 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
847 int *top_left_x, *top_left_y, *bottom_right_x, *bottom_right_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
848 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
849 window_box (w, area, top_left_x, top_left_y, bottom_right_x,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
850 bottom_right_y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
851 *bottom_right_x += *top_left_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
852 *bottom_right_y += *top_left_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
853 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
854
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
855
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
856
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
857 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
858 Utilities
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
859 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
860
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
861 /* Return the next character from STR which is MAXLEN bytes long.
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
862 Return in *LEN the length of the character. This is like
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
863 STRING_CHAR_AND_LENGTH but never returns an invalid character. If
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
864 we find one, we return a `?', but with the length of the illegal
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
865 character. */
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
866
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
867 static INLINE int
25098
188fc8b67ea9 (string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents: 25096
diff changeset
868 string_char_and_length (str, maxlen, len)
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
869 unsigned char *str;
25098
188fc8b67ea9 (string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents: 25096
diff changeset
870 int maxlen, *len;
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
871 {
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
872 int c;
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
873
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
874 c = STRING_CHAR_AND_LENGTH (str, maxlen, *len);
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
875 if (!CHAR_VALID_P (c, 1))
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
876 /* We may not change the length here because other places in Emacs
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
877 don't use this function, i.e. they silently accept illegal
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
878 characters. */
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
879 c = '?';
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
880
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
881 return c;
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
882 }
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
883
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
884
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
885
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
886 /* Given a position POS containing a valid character and byte position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
887 in STRING, return the position NCHARS ahead (NCHARS >= 0). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
888
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
889 static struct text_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
890 string_pos_nchars_ahead (pos, string, nchars)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
891 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
892 Lisp_Object string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
893 int nchars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
894 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
895 xassert (STRINGP (string) && nchars >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
896
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
897 if (STRING_MULTIBYTE (string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
898 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
899 int rest = STRING_BYTES (XSTRING (string)) - BYTEPOS (pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
900 unsigned char *p = XSTRING (string)->data + BYTEPOS (pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
901 int len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
902
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
903 while (nchars--)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
904 {
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
905 string_char_and_length (p, rest, &len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
906 p += len, rest -= len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
907 xassert (rest >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
908 CHARPOS (pos) += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
909 BYTEPOS (pos) += len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
910 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
911 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
912 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
913 SET_TEXT_POS (pos, CHARPOS (pos) + nchars, BYTEPOS (pos) + nchars);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
914
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
915 return pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
916 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
917
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
918
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
919 /* Value is the text position, i.e. character and byte position,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
920 for character position CHARPOS in STRING. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
921
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
922 static INLINE struct text_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
923 string_pos (charpos, string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
924 int charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
925 Lisp_Object string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
926 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
927 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
928 xassert (STRINGP (string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
929 xassert (charpos >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
930 SET_TEXT_POS (pos, charpos, string_char_to_byte (string, charpos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
931 return pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
932 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
933
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
934
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
935 /* Value is a text position, i.e. character and byte position, for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
936 character position CHARPOS in C string S. MULTIBYTE_P non-zero
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
937 means recognize multibyte characters. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
938
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
939 static struct text_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
940 c_string_pos (charpos, s, multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
941 int charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
942 unsigned char *s;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
943 int multibyte_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
944 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
945 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
946
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
947 xassert (s != NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
948 xassert (charpos >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
949
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
950 if (multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
951 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
952 int rest = strlen (s), len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
953
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
954 SET_TEXT_POS (pos, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
955 while (charpos--)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
956 {
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
957 string_char_and_length (s, rest, &len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
958 s += len, rest -= len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
959 xassert (rest >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
960 CHARPOS (pos) += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
961 BYTEPOS (pos) += len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
962 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
963 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
964 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
965 SET_TEXT_POS (pos, charpos, charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
966
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
967 return pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
968 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
969
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
970
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
971 /* Value is the number of characters in C string S. MULTIBYTE_P
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
972 non-zero means recognize multibyte characters. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
973
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
974 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
975 number_of_chars (s, multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
976 unsigned char *s;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
977 int multibyte_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
978 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
979 int nchars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
980
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
981 if (multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
982 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
983 int rest = strlen (s), len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
984 unsigned char *p = (unsigned char *) s;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
985
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
986 for (nchars = 0; rest > 0; ++nchars)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
987 {
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
988 string_char_and_length (p, rest, &len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
989 rest -= len, p += len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
990 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
991 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
992 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
993 nchars = strlen (s);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
994
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
995 return nchars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
996 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
997
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
998
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
999 /* Compute byte position NEWPOS->bytepos corresponding to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1000 NEWPOS->charpos. POS is a known position in string STRING.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1001 NEWPOS->charpos must be >= POS.charpos. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1002
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1003 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1004 compute_string_pos (newpos, pos, string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1005 struct text_pos *newpos, pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1006 Lisp_Object string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1007 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1008 xassert (STRINGP (string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1009 xassert (CHARPOS (*newpos) >= CHARPOS (pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1010
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1011 if (STRING_MULTIBYTE (string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1012 *newpos = string_pos_nchars_ahead (pos, CHARPOS (*newpos) - CHARPOS (pos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1013 string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1014 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1015 BYTEPOS (*newpos) = CHARPOS (*newpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1016 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1017
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1018
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1019 /* Return the charset of the character at position POS in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1020 current_buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1021
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1022 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1023 charset_at_position (pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1024 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1025 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1026 int c, multibyte_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1027 unsigned char *p = BYTE_POS_ADDR (BYTEPOS (pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1028
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1029 multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1030 if (multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1031 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1032 int maxlen = ((BYTEPOS (pos) >= GPT_BYTE ? ZV_BYTE : GPT_BYTE)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1033 - BYTEPOS (pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1034 int len;
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1035 c = string_char_and_length (p, maxlen, &len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1036 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1037 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1038 c = *p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1039
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1040 return CHAR_CHARSET (c);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1041 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1042
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1043
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1044
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1045 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1046 Lisp form evaluation
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1047 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1048
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1049 /* Error handler for eval_form. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1050
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1051 static Lisp_Object
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1052 eval_handler (arg)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1053 Lisp_Object arg;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1054 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1055 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1056 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1057
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1058
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1059 /* Evaluate SEXPR and return the result, or nil if something went
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1060 wrong. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1061
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1062 static Lisp_Object
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1063 eval_form (sexpr)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1064 Lisp_Object sexpr;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1065 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1066 int count = specpdl_ptr - specpdl;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1067 Lisp_Object val;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1068 specbind (Qinhibit_redisplay, Qt);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1069 val = internal_condition_case_1 (Feval, sexpr, Qerror, eval_handler);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1070 return unbind_to (count, val);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1071 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1072
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1073
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1074
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1075 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1076 Debugging
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1077 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1078
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1079 #if 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1080
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1081 /* Define CHECK_IT to perform sanity checks on iterators.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1082 This is for debugging. It is too slow to do unconditionally. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1083
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1084 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1085 check_it (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1086 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1087 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1088 if (it->method == next_element_from_string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1089 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1090 xassert (STRINGP (it->string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1091 xassert (IT_STRING_CHARPOS (*it) >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1092 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1093 else if (it->method == next_element_from_buffer)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1094 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1095 /* Check that character and byte positions agree. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1096 xassert (IT_CHARPOS (*it) == BYTE_TO_CHAR (IT_BYTEPOS (*it)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1097 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1098
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1099 if (it->dpvec)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1100 xassert (it->current.dpvec_index >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1101 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1102 xassert (it->current.dpvec_index < 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1103 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1104
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1105 #define CHECK_IT(IT) check_it ((IT))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1106
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1107 #else /* not 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1108
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1109 #define CHECK_IT(IT) (void) 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1110
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1111 #endif /* not 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1112
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1113
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1114 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1115
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1116 /* Check that the window end of window W is what we expect it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1117 to be---the last row in the current matrix displaying text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1118
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1119 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1120 check_window_end (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1121 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1122 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1123 if (!MINI_WINDOW_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1124 && !NILP (w->window_end_valid))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1125 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1126 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1127 xassert ((row = MATRIX_ROW (w->current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1128 XFASTINT (w->window_end_vpos)),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1129 !row->enabled_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1130 || MATRIX_ROW_DISPLAYS_TEXT_P (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1131 || MATRIX_ROW_VPOS (row, w->current_matrix) == 0));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1132 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1133 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1134
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1135 #define CHECK_WINDOW_END(W) check_window_end ((W))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1136
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1137 #else /* not GLYPH_DEBUG */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1138
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1139 #define CHECK_WINDOW_END(W) (void) 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1140
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1141 #endif /* not GLYPH_DEBUG */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1142
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1143
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1144
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1145 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1146 Iterator initialization
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1147 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1148
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1149 /* Initialize IT for displaying current_buffer in window W, starting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1150 at character position CHARPOS. CHARPOS < 0 means that no buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1151 position is specified which is useful when the iterator is assigned
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1152 a position later. BYTEPOS is the byte position corresponding to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1153 CHARPOS. BYTEPOS <= 0 means compute it from CHARPOS.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1154
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1155 If ROW is not null, calls to produce_glyphs with IT as parameter
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1156 will produce glyphs in that row.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1157
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1158 BASE_FACE_ID is the id of a base face to use. It must be one of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1159 DEFAULT_FACE_ID for normal text, MODE_LINE_FACE_ID or
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1160 HEADER_LINE_FACE_ID for displaying mode lines, or TOOL_BAR_FACE_ID for
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
1161 displaying the tool-bar.
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1162
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1163 If ROW is null and BASE_FACE_ID is equal to MODE_LINE_FACE_ID or
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1164 HEADER_LINE_FACE_ID, the iterator will be initialized to use the
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1165 corresponding mode line glyph row of the desired matrix of W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1166
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1167 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1168 init_iterator (it, w, charpos, bytepos, row, base_face_id)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1169 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1170 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1171 int charpos, bytepos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1172 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1173 enum face_id base_face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1174 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1175 int highlight_region_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1176
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1177 /* Some precondition checks. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1178 xassert (w != NULL && it != NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1179 xassert (charpos < 0 || (charpos > 0 && charpos <= ZV));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1180
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1181 /* If face attributes have been changed since the last redisplay,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1182 free realized faces now because they depend on face definitions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1183 that might have changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1184 if (face_change_count)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1185 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1186 face_change_count = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1187 free_all_realized_faces (Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1188 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1189
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1190 /* Use one of the mode line rows of W's desired matrix if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1191 appropriate. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1192 if (row == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1193 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1194 if (base_face_id == MODE_LINE_FACE_ID)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1195 row = MATRIX_MODE_LINE_ROW (w->desired_matrix);
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1196 else if (base_face_id == HEADER_LINE_FACE_ID)
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1197 row = MATRIX_HEADER_LINE_ROW (w->desired_matrix);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1198 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1199
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1200 /* Clear IT. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1201 bzero (it, sizeof *it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1202 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1203 it->current.dpvec_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1204 it->charset = CHARSET_ASCII;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1205 it->base_face_id = base_face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1206
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1207 /* The window in which we iterate over current_buffer: */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1208 XSETWINDOW (it->window, w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1209 it->w = w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1210 it->f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1211
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1212 /* If realized faces have been removed, e.g. because of face
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1213 attribute changes of named faces, recompute them. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1214 if (FRAME_FACE_CACHE (it->f)->used == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1215 recompute_basic_faces (it->f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1216
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1217 /* Current value of the `space-width', and 'height' properties. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1218 it->space_width = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1219 it->font_height = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1220
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1221 /* Are control characters displayed as `^C'? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1222 it->ctl_arrow_p = !NILP (current_buffer->ctl_arrow);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1223
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1224 /* -1 means everything between a CR and the following line end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1225 is invisible. >0 means lines indented more than this value are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1226 invisible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1227 it->selective = (INTEGERP (current_buffer->selective_display)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1228 ? XFASTINT (current_buffer->selective_display)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1229 : (!NILP (current_buffer->selective_display)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1230 ? -1 : 0));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1231 it->selective_display_ellipsis_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1232 = !NILP (current_buffer->selective_display_ellipses);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1233
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1234 /* Display table to use. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1235 it->dp = window_display_table (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1236
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1237 /* Are multibyte characters enabled in current_buffer? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1238 it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1239
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1240 /* Non-zero if we should highlight the region. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1241 highlight_region_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1242 = (!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1243 && !NILP (current_buffer->mark_active)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1244 && XMARKER (current_buffer->mark)->buffer != 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1245
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1246 /* Set IT->region_beg_charpos and IT->region_end_charpos to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1247 start and end of a visible region in window IT->w. Set both to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1248 -1 to indicate no region. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1249 if (highlight_region_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1250 /* Maybe highlight only in selected window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1251 && (/* Either show region everywhere. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1252 highlight_nonselected_windows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1253 /* Or show region in the selected window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1254 || w == XWINDOW (selected_window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1255 /* Or show the region if we are in the mini-buffer and W is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1256 the window the mini-buffer refers to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1257 || (MINI_WINDOW_P (XWINDOW (selected_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1258 && w == XWINDOW (Vminibuf_scroll_window))))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1259 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1260 int charpos = marker_position (current_buffer->mark);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1261 it->region_beg_charpos = min (PT, charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1262 it->region_end_charpos = max (PT, charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1263 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1264 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1265 it->region_beg_charpos = it->region_end_charpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1266
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1267 /* Get the position at which the redisplay_end_trigger hook should
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1268 be run, if it is to be run at all. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1269 if (MARKERP (w->redisplay_end_trigger)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1270 && XMARKER (w->redisplay_end_trigger)->buffer != 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1271 it->redisplay_end_trigger_charpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1272 = marker_position (w->redisplay_end_trigger);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1273 else if (INTEGERP (w->redisplay_end_trigger))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1274 it->redisplay_end_trigger_charpos = XINT (w->redisplay_end_trigger);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1275
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1276 /* Correct bogus values of tab_width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1277 it->tab_width = XINT (current_buffer->tab_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1278 if (it->tab_width <= 0 || it->tab_width > 1000)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1279 it->tab_width = 8;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1280
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1281 /* Are lines in the display truncated? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1282 it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1283 = (base_face_id != DEFAULT_FACE_ID
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1284 || XINT (it->w->hscroll)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1285 || (truncate_partial_width_windows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1286 && !WINDOW_FULL_WIDTH_P (it->w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1287 || !NILP (current_buffer->truncate_lines));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1288
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1289 /* Get dimensions of truncation and continuation glyphs. These are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1290 displayed as bitmaps under X, so we don't need them for such
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1291 frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1292 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1293 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1294 if (it->truncate_lines_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1295 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1296 /* We will need the truncation glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1297 xassert (it->glyph_row == NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1298 produce_special_glyphs (it, IT_TRUNCATION);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1299 it->truncation_pixel_width = it->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1300 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1301 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1302 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1303 /* We will need the continuation glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1304 xassert (it->glyph_row == NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1305 produce_special_glyphs (it, IT_CONTINUATION);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1306 it->continuation_pixel_width = it->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1307 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1308
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1309 /* Reset these values to zero becaue the produce_special_glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1310 above has changed them. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1311 it->pixel_width = it->ascent = it->descent = 0;
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
1312 it->phys_ascent = it->phys_descent = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1313 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1314
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1315 /* Set this after getting the dimensions of truncation and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1316 continuation glyphs, so that we don't produce glyphs when calling
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1317 produce_special_glyphs, above. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1318 it->glyph_row = row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1319 it->area = TEXT_AREA;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1320
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1321 /* Get the dimensions of the display area. The display area
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1322 consists of the visible window area plus a horizontally scrolled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1323 part to the left of the window. All x-values are relative to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1324 start of this total display area. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1325 if (base_face_id != DEFAULT_FACE_ID)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1326 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1327 /* Mode lines, menu bar in terminal frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1328 it->first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1329 it->last_visible_x = XFASTINT (w->width) * CANON_X_UNIT (it->f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1330 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1331 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1332 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1333 it->first_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1334 = XFASTINT (it->w->hscroll) * CANON_X_UNIT (it->f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1335 it->last_visible_x = (it->first_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1336 + window_box_width (w, TEXT_AREA));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1337
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1338 /* If we truncate lines, leave room for the truncator glyph(s) at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1339 the right margin. Otherwise, leave room for the continuation
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1340 glyph(s). Truncation and continuation glyphs are not inserted
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1341 for window-based redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1342 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1343 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1344 if (it->truncate_lines_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1345 it->last_visible_x -= it->truncation_pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1346 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1347 it->last_visible_x -= it->continuation_pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1348 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1349
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1350 it->header_line_p = WINDOW_WANTS_HEADER_LINE_P (w);
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1351 it->current_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w) + w->vscroll;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1352 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1353
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1354 /* Leave room for a border glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1355 if (!FRAME_WINDOW_P (it->f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1356 && !WINDOW_RIGHTMOST_P (it->w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1357 it->last_visible_x -= 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1358
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1359 it->last_visible_y = window_text_bottom_y (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1360
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1361 /* For mode lines and alike, arrange for the first glyph having a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1362 left box line if the face specifies a box. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1363 if (base_face_id != DEFAULT_FACE_ID)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1364 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1365 struct face *face;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1366
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1367 it->face_id = base_face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1368
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1369 /* If we have a boxed mode line, make the first character appear
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1370 with a left box line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1371 face = FACE_FROM_ID (it->f, base_face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1372 if (face->box != FACE_NO_BOX)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1373 it->start_of_box_run_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1374 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1375
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1376 /* If a buffer position was specified, set the iterator there,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1377 getting overlays and face properties from that position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1378 if (charpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1379 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1380 it->end_charpos = ZV;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1381 it->face_id = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1382 IT_CHARPOS (*it) = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1383
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1384 /* Compute byte position if not specified. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1385 if (bytepos <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1386 IT_BYTEPOS (*it) = CHAR_TO_BYTE (charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1387 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1388 IT_BYTEPOS (*it) = bytepos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1389
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1390 /* Compute faces etc. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1391 reseat (it, it->current.pos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1392 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1393
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1394 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1395 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1396
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1397
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1398 /* Initialize IT for the display of window W with window start POS. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1399
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1400 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1401 start_display (it, w, pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1402 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1403 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1404 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1405 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1406 int start_at_line_beg_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1407 struct glyph_row *row;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1408 int first_vpos = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1409 int first_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1410
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1411 row = w->desired_matrix->rows + first_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1412 init_iterator (it, w, CHARPOS (pos), BYTEPOS (pos), row, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1413 first_y = it->current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1414
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1415 /* If window start is not at a line start, move back to the line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1416 start. This makes sure that we take continuation lines into
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1417 account. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1418 start_at_line_beg_p = (CHARPOS (pos) == BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1419 || FETCH_BYTE (BYTEPOS (pos) - 1) == '\n');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1420 if (!start_at_line_beg_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1421 reseat_at_previous_visible_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1422
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1423 /* If window start is not at a line start, skip forward to POS to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1424 get the correct continuation_lines_width and current_x. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1425 if (!start_at_line_beg_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1426 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1427 move_it_to (it, CHARPOS (pos), -1, -1, -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1428
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1429 /* If lines are continued, this line may end in the middle of a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1430 multi-glyph character (e.g. a control character displayed as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1431 \003, or in the middle of an overlay string). In this case
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1432 move_it_to above will not have taken us to the start of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1433 the continuation line but to the end of the continued line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1434 if (!it->truncate_lines_p && it->current_x > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1435 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1436 if (it->current.dpvec_index >= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1437 || it->current.overlay_string_index >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1438 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1439 set_iterator_to_next (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1440 move_it_in_display_line_to (it, -1, -1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1441 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1442 it->continuation_lines_width += it->current_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1443 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1444
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1445 it->current_y = first_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1446 it->vpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1447 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1448 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1449
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1450 #if 0 /* Don't assert the following because start_display is sometimes
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1451 called intentionally with a window start that is not at a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1452 line start. Please leave this code in as a comment. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1453
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1454 /* Window start should be on a line start, now. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1455 xassert (it->continuation_lines_width
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1456 || IT_CHARPOS (it) == BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1457 || FETCH_BYTE (IT_BYTEPOS (it) - 1) == '\n');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1458 #endif /* 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1459 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1460
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1461
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1462 /* Initialize IT for stepping through current_buffer in window W,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1463 starting at position POS that includes overlay string and display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1464 vector/ control character translation position information. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1465
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1466 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1467 init_from_display_pos (it, w, pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1468 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1469 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1470 struct display_pos *pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1471 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1472 /* Keep in mind: the call to reseat in init_iterator skips invisible
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1473 text, so we might end up at a position different from POS. This
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1474 is only a problem when POS is a row start after a newline and an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1475 overlay starts there with an after-string, and the overlay has an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1476 invisible property. Since we don't skip invisible text in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1477 display_line and elsewhere immediately after consuming the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1478 newline before the row start, such a POS will not be in a string,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1479 but the call to init_iterator below will move us to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1480 after-string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1481 init_iterator (it, w, CHARPOS (pos->pos), BYTEPOS (pos->pos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1482 NULL, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1483
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1484 /* If position is within an overlay string, set up IT to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1485 the right overlay string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1486 if (pos->overlay_string_index >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1487 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1488 int relative_index;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1489
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1490 /* We already have the first chunk of overlay strings in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1491 IT->overlay_strings. Load more until the one for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1492 pos->overlay_string_index is in IT->overlay_strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1493 if (pos->overlay_string_index >= OVERLAY_STRING_CHUNK_SIZE)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1494 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1495 int n = pos->overlay_string_index / OVERLAY_STRING_CHUNK_SIZE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1496 it->current.overlay_string_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1497 while (n--)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1498 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1499 load_overlay_strings (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1500 it->current.overlay_string_index += OVERLAY_STRING_CHUNK_SIZE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1501 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1502 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1503
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1504 it->current.overlay_string_index = pos->overlay_string_index;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1505 relative_index = (it->current.overlay_string_index
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1506 % OVERLAY_STRING_CHUNK_SIZE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1507 it->string = it->overlay_strings[relative_index];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1508 it->current.string_pos = pos->string_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1509 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1510 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1511 else if (CHARPOS (pos->string_pos) >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1512 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1513 /* Recorded position is not in an overlay string, but in another
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1514 string. This can only be a string from a `display' property.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1515 IT should already be filled with that string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1516 it->current.string_pos = pos->string_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1517 xassert (STRINGP (it->string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1518 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1519
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1520 /* Restore position in display vector translations or control
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1521 character translations. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1522 if (pos->dpvec_index >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1523 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1524 /* This fills IT->dpvec. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1525 get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1526 xassert (it->dpvec && it->current.dpvec_index == 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1527 it->current.dpvec_index = pos->dpvec_index;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1528 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1529
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1530 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1531 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1532
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1533
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1534 /* Initialize IT for stepping through current_buffer in window W
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1535 starting at ROW->start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1536
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1537 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1538 init_to_row_start (it, w, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1539 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1540 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1541 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1542 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1543 init_from_display_pos (it, w, &row->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1544 it->continuation_lines_width = row->continuation_lines_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1545 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1546 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1547
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1548
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1549 /* Initialize IT for stepping through current_buffer in window W
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1550 starting in the line following ROW, i.e. starting at ROW->end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1551
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1552 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1553 init_to_row_end (it, w, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1554 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1555 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1556 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1557 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1558 init_from_display_pos (it, w, &row->end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1559
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1560 if (row->continued_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1561 it->continuation_lines_width = (row->continuation_lines_width
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1562 + row->pixel_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1563 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1564 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1565
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1566
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1567
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1568
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1569 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1570 Text properties
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1571 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1572
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1573 /* Called when IT reaches IT->stop_charpos. Handle text property and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1574 overlay changes. Set IT->stop_charpos to the next position where
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1575 to stop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1576
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1577 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1578 handle_stop (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1579 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1580 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1581 enum prop_handled handled;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1582 int handle_overlay_change_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1583 struct props *p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1584
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1585 it->dpvec = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1586 it->current.dpvec_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1587
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1588 do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1589 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1590 handled = HANDLED_NORMALLY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1591
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1592 /* Call text property handlers. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1593 for (p = it_props; p->handler; ++p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1594 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1595 handled = p->handler (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1596
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1597 if (handled == HANDLED_RECOMPUTE_PROPS)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1598 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1599 else if (handled == HANDLED_RETURN)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1600 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1601 else if (handled == HANDLED_OVERLAY_STRING_CONSUMED)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1602 handle_overlay_change_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1603 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1604
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1605 if (handled != HANDLED_RECOMPUTE_PROPS)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1606 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1607 /* Don't check for overlay strings below when set to deliver
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1608 characters from a display vector. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1609 if (it->method == next_element_from_display_vector)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1610 handle_overlay_change_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1611
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1612 /* Handle overlay changes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1613 if (handle_overlay_change_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1614 handled = handle_overlay_change (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1615
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1616 /* Determine where to stop next. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1617 if (handled == HANDLED_NORMALLY)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1618 compute_stop_pos (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1619 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1620 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1621 while (handled == HANDLED_RECOMPUTE_PROPS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1622 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1623
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1624
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1625 /* Compute IT->stop_charpos from text property and overlay change
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1626 information for IT's current position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1627
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1628 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1629 compute_stop_pos (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1630 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1631 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1632 register INTERVAL iv, next_iv;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1633 Lisp_Object object, limit, position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1634
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1635 /* If nowhere else, stop at the end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1636 it->stop_charpos = it->end_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1637
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1638 if (STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1639 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1640 /* Strings are usually short, so don't limit the search for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1641 properties. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1642 object = it->string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1643 limit = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1644 XSETFASTINT (position, IT_STRING_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1645 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1646 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1647 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1648 int charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1649
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1650 /* If next overlay change is in front of the current stop pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1651 (which is IT->end_charpos), stop there. Note: value of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1652 next_overlay_change is point-max if no overlay change
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1653 follows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1654 charpos = next_overlay_change (IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1655 if (charpos < it->stop_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1656 it->stop_charpos = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1657
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1658 /* If showing the region, we have to stop at the region
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1659 start or end because the face might change there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1660 if (it->region_beg_charpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1661 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1662 if (IT_CHARPOS (*it) < it->region_beg_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1663 it->stop_charpos = min (it->stop_charpos, it->region_beg_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1664 else if (IT_CHARPOS (*it) < it->region_end_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1665 it->stop_charpos = min (it->stop_charpos, it->region_end_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1666 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1667
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1668 /* Set up variables for computing the stop position from text
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1669 property changes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1670 XSETBUFFER (object, current_buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1671 XSETFASTINT (limit, IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1672 XSETFASTINT (position, IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1673
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1674 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1675
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1676 /* Get the interval containing IT's position. Value is a null
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1677 interval if there isn't such an interval. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1678 iv = validate_interval_range (object, &position, &position, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1679 if (!NULL_INTERVAL_P (iv))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1680 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1681 Lisp_Object values_here[LAST_PROP_IDX];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1682 struct props *p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1683
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1684 /* Get properties here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1685 for (p = it_props; p->handler; ++p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1686 values_here[p->idx] = textget (iv->plist, *p->name);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1687
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1688 /* Look for an interval following iv that has different
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1689 properties. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1690 for (next_iv = next_interval (iv);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1691 (!NULL_INTERVAL_P (next_iv)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1692 && (NILP (limit)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1693 || XFASTINT (limit) > next_iv->position));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1694 next_iv = next_interval (next_iv))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1695 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1696 for (p = it_props; p->handler; ++p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1697 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1698 Lisp_Object new_value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1699
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1700 new_value = textget (next_iv->plist, *p->name);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1701 if (!EQ (values_here[p->idx], new_value))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1702 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1703 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1704
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1705 if (p->handler)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1706 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1707 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1708
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1709 if (!NULL_INTERVAL_P (next_iv))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1710 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1711 if (INTEGERP (limit)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1712 && next_iv->position >= XFASTINT (limit))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1713 /* No text property change up to limit. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1714 it->stop_charpos = min (XFASTINT (limit), it->stop_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1715 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1716 /* Text properties change in next_iv. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1717 it->stop_charpos = min (it->stop_charpos, next_iv->position);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1718 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1719 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1720
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1721 xassert (STRINGP (it->string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1722 || (it->stop_charpos >= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1723 && it->stop_charpos >= IT_CHARPOS (*it)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1724 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1725
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1726
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1727 /* Return the position of the next overlay change after POS in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1728 current_buffer. Value is point-max if no overlay change
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1729 follows. This is like `next-overlay-change' but doesn't use
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1730 xmalloc. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1731
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1732 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1733 next_overlay_change (pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1734 int pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1735 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1736 int noverlays;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1737 int endpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1738 Lisp_Object *overlays;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1739 int len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1740 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1741
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1742 /* Get all overlays at the given position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1743 len = 10;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1744 overlays = (Lisp_Object *) alloca (len * sizeof *overlays);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1745 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1746 if (noverlays > len)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1747 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1748 len = noverlays;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1749 overlays = (Lisp_Object *) alloca (len * sizeof *overlays);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1750 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1751 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1752
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1753 /* If any of these overlays ends before endpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1754 use its ending point instead. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1755 for (i = 0; i < noverlays; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1756 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1757 Lisp_Object oend;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1758 int oendpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1759
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1760 oend = OVERLAY_END (overlays[i]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1761 oendpos = OVERLAY_POSITION (oend);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1762 endpos = min (endpos, oendpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1763 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1764
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1765 return endpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1766 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1767
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1768
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1769
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1770 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1771 Fontification
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1772 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1773
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1774 /* Handle changes in the `fontified' property of the current buffer by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1775 calling hook functions from Qfontification_functions to fontify
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1776 regions of text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1777
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1778 static enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1779 handle_fontified_prop (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1780 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1781 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1782 Lisp_Object prop, pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1783 enum prop_handled handled = HANDLED_NORMALLY;
26018
8e4c1c04059b (handle_fontified_prop): GCPRO pos.
Dave Love <fx@gnu.org>
parents: 25882
diff changeset
1784 struct gcpro gcpro1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1785
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1786 /* Get the value of the `fontified' property at IT's current buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1787 position. (The `fontified' property doesn't have a special
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1788 meaning in strings.) If the value is nil, call functions from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1789 Qfontification_functions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1790 if (!STRINGP (it->string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1791 && it->s == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1792 && !NILP (Vfontification_functions)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1793 && (pos = make_number (IT_CHARPOS (*it)),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1794 prop = Fget_char_property (pos, Qfontified, Qnil),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1795 NILP (prop)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1796 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1797 Lisp_Object args[2];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1798
26018
8e4c1c04059b (handle_fontified_prop): GCPRO pos.
Dave Love <fx@gnu.org>
parents: 25882
diff changeset
1799 GCPRO1 (pos);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1800 /* Run the hook functions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1801 args[0] = Qfontification_functions;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1802 args[1] = pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1803 Frun_hook_with_args (make_number (2), args);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1804
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1805 /* Return HANDLED_RECOMPUTE_PROPS only if function fontified
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1806 something. This avoids an endless loop if they failed to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1807 fontify the text for which reason ever. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1808 if (!NILP (Fget_char_property (pos, Qfontified, Qnil)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1809 handled = HANDLED_RECOMPUTE_PROPS;
26018
8e4c1c04059b (handle_fontified_prop): GCPRO pos.
Dave Love <fx@gnu.org>
parents: 25882
diff changeset
1810 UNGCPRO;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1811 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1812
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1813 return handled;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1814 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1815
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1816
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1817
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1818 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1819 Faces
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1820 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1821
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1822 /* Set up iterator IT from face properties at its current position.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1823 Called from handle_stop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1824
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1825 static enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1826 handle_face_prop (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1827 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1828 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1829 int new_face_id, next_stop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1830
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1831 if (!STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1832 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1833 new_face_id
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1834 = face_at_buffer_position (it->w,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1835 IT_CHARPOS (*it),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1836 it->region_beg_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1837 it->region_end_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1838 &next_stop,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1839 (IT_CHARPOS (*it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1840 + TEXT_PROP_DISTANCE_LIMIT),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1841 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1842
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1843 /* Is this a start of a run of characters with box face?
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1844 Caveat: this can be called for a freshly initialized
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1845 iterator; face_id is -1 is this case. We know that the new
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1846 face will not change until limit, i.e. if the new face has a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1847 box, all characters up to limit will have one. But, as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1848 usual, we don't know whether limit is really the end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1849 if (new_face_id != it->face_id)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1850 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1851 struct face *new_face = FACE_FROM_ID (it->f, new_face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1852
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1853 /* If new face has a box but old face has not, this is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1854 the start of a run of characters with box, i.e. it has
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1855 a shadow on the left side. The value of face_id of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1856 iterator will be -1 if this is the initial call that gets
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1857 the face. In this case, we have to look in front of IT's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1858 position and see whether there is a face != new_face_id. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1859 it->start_of_box_run_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1860 = (new_face->box != FACE_NO_BOX
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1861 && (it->face_id >= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1862 || IT_CHARPOS (*it) == BEG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1863 || new_face_id != face_before_it_pos (it)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1864 it->face_box_p = new_face->box != FACE_NO_BOX;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1865 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1866 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1867 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1868 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1869 new_face_id
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1870 = face_at_string_position (it->w,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1871 it->string,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1872 IT_STRING_CHARPOS (*it),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1873 (it->current.overlay_string_index >= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1874 ? IT_CHARPOS (*it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1875 : 0),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1876 it->region_beg_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1877 it->region_end_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1878 &next_stop,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1879 it->base_face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1880
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1881 #if 0 /* This shouldn't be neccessary. Let's check it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1882 /* If IT is used to display a mode line we would really like to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1883 use the mode line face instead of the frame's default face. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1884 if (it->glyph_row == MATRIX_MODE_LINE_ROW (it->w->desired_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1885 && new_face_id == DEFAULT_FACE_ID)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1886 new_face_id = MODE_LINE_FACE_ID;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1887 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1888
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1889 /* Is this a start of a run of characters with box? Caveat:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1890 this can be called for a freshly allocated iterator; face_id
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1891 is -1 is this case. We know that the new face will not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1892 change until the next check pos, i.e. if the new face has a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1893 box, all characters up to that position will have a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1894 box. But, as usual, we don't know whether that position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1895 is really the end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1896 if (new_face_id != it->face_id)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1897 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1898 struct face *new_face = FACE_FROM_ID (it->f, new_face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1899 struct face *old_face = FACE_FROM_ID (it->f, it->face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1900
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1901 /* If new face has a box but old face hasn't, this is the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1902 start of a run of characters with box, i.e. it has a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1903 shadow on the left side. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1904 it->start_of_box_run_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1905 = new_face->box && (old_face == NULL || !old_face->box);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1906 it->face_box_p = new_face->box != FACE_NO_BOX;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1907 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1908 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1909
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1910 it->face_id = new_face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1911 it->charset = CHARSET_ASCII;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1912 return HANDLED_NORMALLY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1913 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1914
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1915
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1916 /* Compute the face one character before or after the current position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1917 of IT. BEFORE_P non-zero means get the face in front of IT's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1918 position. Value is the id of the face. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1919
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1920 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1921 face_before_or_after_it_pos (it, before_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1922 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1923 int before_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1924 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1925 int face_id, limit;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1926 int next_check_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1927 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1928
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1929 xassert (it->s == NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1930
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1931 if (STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1932 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1933 /* No face change past the end of the string (for the case
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1934 we are padding with spaces). No face change before the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1935 string start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1936 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1937 || (IT_STRING_CHARPOS (*it) == 0 && before_p))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1938 return it->face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1939
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1940 /* Set pos to the position before or after IT's current position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1941 if (before_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1942 pos = string_pos (IT_STRING_CHARPOS (*it) - 1, it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1943 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1944 pos = string_pos (IT_STRING_CHARPOS (*it) + 1, it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1945
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1946 /* Get the face for ASCII, or unibyte. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1947 face_id
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1948 = face_at_string_position (it->w,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1949 it->string,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1950 CHARPOS (pos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1951 (it->current.overlay_string_index >= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1952 ? IT_CHARPOS (*it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1953 : 0),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1954 it->region_beg_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1955 it->region_end_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1956 &next_check_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1957 it->base_face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1958
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1959 /* Correct the face for charsets different from ASCII. Do it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1960 for the multibyte case only. The face returned above is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1961 suitable for unibyte text if IT->string is unibyte. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1962 if (STRING_MULTIBYTE (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1963 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1964 unsigned char *p = XSTRING (it->string)->data + BYTEPOS (pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1965 int rest = STRING_BYTES (XSTRING (it->string)) - BYTEPOS (pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1966 int c, len, charset;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1967
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1968 c = string_char_and_length (p, rest, &len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1969 charset = CHAR_CHARSET (c);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1970 if (charset != CHARSET_ASCII)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1971 face_id = FACE_FOR_CHARSET (it->f, face_id, charset);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1972 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1973 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1974 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1975 {
25242
28067247ff90 (face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents: 25197
diff changeset
1976 if ((IT_CHARPOS (*it) >= ZV && !before_p)
28067247ff90 (face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents: 25197
diff changeset
1977 || (IT_CHARPOS (*it) <= BEGV && before_p))
28067247ff90 (face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents: 25197
diff changeset
1978 return it->face_id;
28067247ff90 (face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents: 25197
diff changeset
1979
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1980 limit = IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1981 pos = it->current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1982
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1983 if (before_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1984 DEC_TEXT_POS (pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1985 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1986 INC_TEXT_POS (pos);
25242
28067247ff90 (face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents: 25197
diff changeset
1987
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1988 /* Determine face for CHARSET_ASCII, or unibyte. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1989 face_id = face_at_buffer_position (it->w,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1990 CHARPOS (pos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1991 it->region_beg_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1992 it->region_end_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1993 &next_check_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1994 limit, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1995
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1996 /* Correct the face for charsets different from ASCII. Do it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1997 for the multibyte case only. The face returned above is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1998 suitable for unibyte text if current_buffer is unibyte. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1999 if (it->multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2000 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2001 int charset = charset_at_position (pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2002 if (charset != CHARSET_ASCII)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2003 face_id = FACE_FOR_CHARSET (it->f, face_id, charset);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2004 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2005 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2006
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2007 return face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2008 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2009
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2010
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2011
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2012 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2013 Invisible text
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2014 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2015
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2016 /* Set up iterator IT from invisible properties at its current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2017 position. Called from handle_stop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2018
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2019 static enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2020 handle_invisible_prop (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2021 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2022 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2023 enum prop_handled handled = HANDLED_NORMALLY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2024
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2025 if (STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2026 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2027 extern Lisp_Object Qinvisible;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2028 Lisp_Object prop, end_charpos, limit, charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2029
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2030 /* Get the value of the invisible text property at the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2031 current position. Value will be nil if there is no such
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2032 property. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2033 XSETFASTINT (charpos, IT_STRING_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2034 prop = Fget_text_property (charpos, Qinvisible, it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2035
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2036 if (!NILP (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2037 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2038 handled = HANDLED_RECOMPUTE_PROPS;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2039
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2040 /* Get the position at which the next change of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2041 invisible text property can be found in IT->string.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2042 Value will be nil if the property value is the same for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2043 all the rest of IT->string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2044 XSETINT (limit, XSTRING (it->string)->size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2045 end_charpos = Fnext_single_property_change (charpos, Qinvisible,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2046 it->string, limit);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2047
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2048 /* Text at current position is invisible. The next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2049 change in the property is at position end_charpos.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2050 Move IT's current position to that position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2051 if (INTEGERP (end_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2052 && XFASTINT (end_charpos) < XFASTINT (limit))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2053 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2054 struct text_pos old;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2055 old = it->current.string_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2056 IT_STRING_CHARPOS (*it) = XFASTINT (end_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2057 compute_string_pos (&it->current.string_pos, old, it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2058 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2059 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2060 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2061 /* The rest of the string is invisible. If this is an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2062 overlay string, proceed with the next overlay string
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2063 or whatever comes and return a character from there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2064 if (it->current.overlay_string_index >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2065 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2066 next_overlay_string (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2067 /* Don't check for overlay strings when we just
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2068 finished processing them. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2069 handled = HANDLED_OVERLAY_STRING_CONSUMED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2070 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2071 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2072 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2073 struct Lisp_String *s = XSTRING (it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2074 IT_STRING_CHARPOS (*it) = s->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2075 IT_STRING_BYTEPOS (*it) = STRING_BYTES (s);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2076 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2077 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2078 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2079 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2080 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2081 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2082 int visible_p, newpos, next_stop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2083 Lisp_Object pos, prop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2084
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2085 /* First of all, is there invisible text at this position? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2086 XSETFASTINT (pos, IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2087 prop = Fget_char_property (pos, Qinvisible, it->window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2088
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2089 /* If we are on invisible text, skip over it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2090 if (TEXT_PROP_MEANS_INVISIBLE (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2091 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2092 /* Record whether we have to display an ellipsis for the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2093 invisible text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2094 int display_ellipsis_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2095 = TEXT_PROP_MEANS_INVISIBLE_WITH_ELLIPSIS (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2096
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2097 handled = HANDLED_RECOMPUTE_PROPS;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2098
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2099 /* Loop skipping over invisible text. The loop is left at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2100 ZV or with IT on the first char being visible again. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2101 do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2102 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2103 /* Try to skip some invisible text. Return value is the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2104 position reached which can be equal to IT's position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2105 if there is nothing invisible here. This skips both
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2106 over invisible text properties and overlays with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2107 invisible property. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2108 newpos = skip_invisible (IT_CHARPOS (*it),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2109 &next_stop, ZV, it->window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2110
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2111 /* If we skipped nothing at all we weren't at invisible
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2112 text in the first place. If everything to the end of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2113 the buffer was skipped, end the loop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2114 if (newpos == IT_CHARPOS (*it) || newpos >= ZV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2115 visible_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2116 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2117 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2118 /* We skipped some characters but not necessarily
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2119 all there are. Check if we ended up on visible
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2120 text. Fget_char_property returns the property of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2121 the char before the given position, i.e. if we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2122 get visible_p = 1, this means that the char at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2123 newpos is visible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2124 XSETFASTINT (pos, newpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2125 prop = Fget_char_property (pos, Qinvisible, it->window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2126 visible_p = !TEXT_PROP_MEANS_INVISIBLE (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2127 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2128
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2129 /* If we ended up on invisible text, proceed to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2130 skip starting with next_stop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2131 if (!visible_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2132 IT_CHARPOS (*it) = next_stop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2133 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2134 while (!visible_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2135
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2136 /* The position newpos is now either ZV or on visible text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2137 IT_CHARPOS (*it) = newpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2138 IT_BYTEPOS (*it) = CHAR_TO_BYTE (newpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2139
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2140 /* Maybe return `...' next for the end of the invisible text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2141 if (display_ellipsis_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2142 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2143 if (it->dp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2144 && VECTORP (DISP_INVIS_VECTOR (it->dp)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2145 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2146 struct Lisp_Vector *v = XVECTOR (DISP_INVIS_VECTOR (it->dp));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2147 it->dpvec = v->contents;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2148 it->dpend = v->contents + v->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2149 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2150 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2151 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2152 /* Default `...'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2153 it->dpvec = default_invis_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2154 it->dpend = default_invis_vector + 3;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2155 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2156
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2157 /* The ellipsis display does not replace the display of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2158 the character at the new position. Indicate this by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2159 setting IT->dpvec_char_len to zero. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2160 it->dpvec_char_len = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2161
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2162 it->current.dpvec_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2163 it->method = next_element_from_display_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2164 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2165 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2166 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2167
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2168 return handled;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2169 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2170
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2171
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2172
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2173 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2174 'display' property
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2175 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2176
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2177 /* Set up iterator IT from `display' property at its current position.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2178 Called from handle_stop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2179
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2180 static enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2181 handle_display_prop (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2182 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2183 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2184 Lisp_Object prop, object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2185 struct text_pos *position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2186 int space_or_image_found_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2187
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2188 if (STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2189 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2190 object = it->string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2191 position = &it->current.string_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2192 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2193 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2194 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2195 object = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2196 position = &it->current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2197 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2198
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2199 /* Reset those iterator values set from display property values. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2200 it->font_height = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2201 it->space_width = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2202 it->voffset = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2203
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2204 /* We don't support recursive `display' properties, i.e. string
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2205 values that have a string `display' property, that have a string
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2206 `display' property etc. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2207 if (!it->string_from_display_prop_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2208 it->area = TEXT_AREA;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2209
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2210 prop = Fget_char_property (make_number (position->charpos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2211 Qdisplay, object);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2212 if (NILP (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2213 return HANDLED_NORMALLY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2214
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2215 space_or_image_found_p = 0;
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2216 if (CONSP (prop)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2217 && CONSP (XCAR (prop))
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2218 && !EQ (Qmargin, XCAR (XCAR (prop))))
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2219 {
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2220 /* A list of sub-properties. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2221 while (CONSP (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2222 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2223 if (handle_single_display_prop (it, XCAR (prop), object, position))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2224 space_or_image_found_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2225 prop = XCDR (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2226 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2227 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2228 else if (VECTORP (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2229 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2230 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2231 for (i = 0; i < XVECTOR (prop)->size; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2232 if (handle_single_display_prop (it, XVECTOR (prop)->contents[i],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2233 object, position))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2234 space_or_image_found_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2235 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2236 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2237 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2238 if (handle_single_display_prop (it, prop, object, position))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2239 space_or_image_found_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2240 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2241
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2242 return space_or_image_found_p ? HANDLED_RETURN : HANDLED_NORMALLY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2243 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2244
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2245
25820
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2246 /* Value is the position of the end of the `display' property starting
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2247 at START_POS in OBJECT. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2248
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2249 static struct text_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2250 display_prop_end (it, object, start_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2251 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2252 Lisp_Object object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2253 struct text_pos start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2254 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2255 Lisp_Object end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2256 struct text_pos end_pos;
25820
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2257
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2258 end = next_single_char_property_change (make_number (CHARPOS (start_pos)),
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2259 Qdisplay, object, Qnil);
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2260 CHARPOS (end_pos) = XFASTINT (end);
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2261 if (STRINGP (object))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2262 compute_string_pos (&end_pos, start_pos, it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2263 else
25820
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2264 BYTEPOS (end_pos) = CHAR_TO_BYTE (XFASTINT (end));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2265
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2266 return end_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2267 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2268
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2269
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2270 /* Set up IT from a single `display' sub-property value PROP. OBJECT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2271 is the object in which the `display' property was found. *POSITION
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2272 is the position at which it was found.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2273
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2274 If PROP is a `space' or `image' sub-property, set *POSITION to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2275 end position of the `display' property.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2276
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2277 Value is non-zero if a `space' or `image' property value was found. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2278
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2279 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2280 handle_single_display_prop (it, prop, object, position)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2281 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2282 Lisp_Object prop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2283 Lisp_Object object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2284 struct text_pos *position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2285 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2286 Lisp_Object value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2287 int space_or_image_found_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2288
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2289 Lisp_Object form;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2290
25614
766b6a577f15 (Qwhen): Replaces QCwhen.
Gerd Moellmann <gerd@gnu.org>
parents: 25598
diff changeset
2291 /* If PROP is a list of the form `(when FORM . VALUE)', FORM is
25598
709e9cdaaab1 (handle_single_display_prop): Change conditional
Gerd Moellmann <gerd@gnu.org>
parents: 25546
diff changeset
2292 evaluated. If the result is nil, VALUE is ignored. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2293 form = Qt;
25614
766b6a577f15 (Qwhen): Replaces QCwhen.
Gerd Moellmann <gerd@gnu.org>
parents: 25598
diff changeset
2294 if (CONSP (prop) && EQ (XCAR (prop), Qwhen))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2295 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2296 prop = XCDR (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2297 if (!CONSP (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2298 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2299 form = XCAR (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2300 prop = XCDR (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2301 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2302
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2303 if (!NILP (form) && !EQ (form, Qt))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2304 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2305 struct gcpro gcpro1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2306 struct text_pos end_pos, pt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2307
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2308 end_pos = display_prop_end (it, object, *position);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2309 GCPRO1 (form);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2310
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2311 /* Temporarily set point to the end position, and then evaluate
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2312 the form. This makes `(eolp)' work as FORM. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2313 CHARPOS (pt) = PT;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2314 BYTEPOS (pt) = PT_BYTE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2315 TEMP_SET_PT_BOTH (CHARPOS (end_pos), BYTEPOS (end_pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2316 form = eval_form (form);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2317 TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2318 UNGCPRO;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2319 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2320
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2321 if (NILP (form))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2322 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2323
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2324 if (CONSP (prop)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2325 && EQ (XCAR (prop), Qheight)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2326 && CONSP (XCDR (prop)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2327 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2328 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2329 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2330
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2331 /* `(height HEIGHT)'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2332 it->font_height = XCAR (XCDR (prop));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2333 if (!NILP (it->font_height))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2334 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2335 struct face *face = FACE_FROM_ID (it->f, it->face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2336 int new_height = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2337
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2338 if (CONSP (it->font_height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2339 && (EQ (XCAR (it->font_height), Qplus)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2340 || EQ (XCAR (it->font_height), Qminus))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2341 && CONSP (XCDR (it->font_height))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2342 && INTEGERP (XCAR (XCDR (it->font_height))))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2343 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2344 /* `(+ N)' or `(- N)' where N is an integer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2345 int steps = XINT (XCAR (XCDR (it->font_height)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2346 if (EQ (XCAR (it->font_height), Qplus))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2347 steps = - steps;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2348 it->face_id = smaller_face (it->f, it->face_id, steps);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2349 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2350 else if (SYMBOLP (it->font_height))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2351 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2352 /* Call function with current height as argument.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2353 Value is the new height. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2354 Lisp_Object form, height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2355 struct gcpro gcpro1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2356
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2357 height = face->lface[LFACE_HEIGHT_INDEX];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2358 form = Fcons (it->font_height, Fcons (height, Qnil));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2359 GCPRO1 (form);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2360 height = eval_form (form);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2361 if (NUMBERP (height))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2362 new_height = XFLOATINT (height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2363 UNGCPRO;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2364 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2365 else if (NUMBERP (it->font_height))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2366 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2367 /* Value is a multiple of the canonical char height. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2368 struct face *face;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2369
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2370 face = FACE_FROM_ID (it->f, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2371 new_height = (XFLOATINT (it->font_height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2372 * XINT (face->lface[LFACE_HEIGHT_INDEX]));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2373 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2374 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2375 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2376 /* Evaluate IT->font_height with `height' bound to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2377 current specified height to get the new height. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2378 Lisp_Object value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2379 int count = specpdl_ptr - specpdl;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2380
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2381 specbind (Qheight, face->lface[LFACE_HEIGHT_INDEX]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2382 value = eval_form (it->font_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2383 unbind_to (count, Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2384
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2385 if (NUMBERP (value))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2386 new_height = XFLOATINT (value);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2387 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2388
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2389 if (new_height > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2390 it->face_id = face_with_height (it->f, it->face_id, new_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2391 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2392 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2393 else if (CONSP (prop)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2394 && EQ (XCAR (prop), Qspace_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2395 && CONSP (XCDR (prop)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2396 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2397 /* `(space_width WIDTH)'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2398 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2399 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2400
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2401 value = XCAR (XCDR (prop));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2402 if (NUMBERP (value) && XFLOATINT (value) > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2403 it->space_width = value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2404 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2405 else if (CONSP (prop)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2406 && EQ (XCAR (prop), Qraise)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2407 && CONSP (XCDR (prop)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2408 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2409 #ifdef HAVE_WINDOW_SYSTEM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2410 /* `(raise FACTOR)'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2411 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2412 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2413
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2414 value = XCAR (XCDR (prop));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2415 if (NUMBERP (value))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2416 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2417 struct face *face = FACE_FROM_ID (it->f, it->face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2418 it->voffset = - (XFLOATINT (value)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2419 * (face->font->ascent + face->font->descent));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2420 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2421 #endif /* HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2422 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2423 else if (!it->string_from_display_prop_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2424 {
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2425 /* `((margin left-margin) VALUE)' or `((margin right-margin)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2426 VALUE) or `((margin nil) VALUE)' or VALUE. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2427 Lisp_Object location, value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2428 struct text_pos start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2429 int valid_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2430
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2431 /* Characters having this form of property are not displayed, so
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2432 we have to find the end of the property. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2433 space_or_image_found_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2434 start_pos = *position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2435 *position = display_prop_end (it, object, start_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2436
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2437 /* Let's stop at the new position and assume that all
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2438 text properties change there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2439 it->stop_charpos = position->charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2440
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2441 location = Qunbound;
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2442 if (CONSP (prop) && CONSP (XCAR (prop)))
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2443 {
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2444 Lisp_Object tem;
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2445
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2446 value = XCDR (prop);
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2447 if (CONSP (value))
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2448 value = XCAR (value);
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2449
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2450 tem = XCAR (prop);
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2451 if (EQ (XCAR (tem), Qmargin)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2452 && (tem = XCDR (tem),
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2453 tem = CONSP (tem) ? XCAR (tem) : Qnil,
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2454 (NILP (tem)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2455 || EQ (tem, Qleft_margin)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2456 || EQ (tem, Qright_margin))))
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2457 location = tem;
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2458 }
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2459
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2460 if (EQ (location, Qunbound))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2461 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2462 location = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2463 value = prop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2464 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2465
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2466 #ifdef HAVE_WINDOW_SYSTEM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2467 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2468 valid_p = STRINGP (value);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2469 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2470 valid_p = (STRINGP (value)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2471 || (CONSP (value) && EQ (XCAR (value), Qspace))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2472 || valid_image_p (value));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2473 #else /* not HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2474 valid_p = STRINGP (value);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2475 #endif /* not HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2476
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2477 if ((EQ (location, Qleft_margin)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2478 || EQ (location, Qright_margin)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2479 || NILP (location))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2480 && valid_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2481 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2482 /* Save current settings of IT so that we can restore them
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2483 when we are finished with the glyph property value. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2484 push_it (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2485
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2486 if (NILP (location))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2487 it->area = TEXT_AREA;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2488 else if (EQ (location, Qleft_margin))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2489 it->area = LEFT_MARGIN_AREA;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2490 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2491 it->area = RIGHT_MARGIN_AREA;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2492
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2493 if (STRINGP (value))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2494 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2495 it->string = value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2496 it->multibyte_p = STRING_MULTIBYTE (it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2497 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2498 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2499 it->end_charpos = it->string_nchars
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2500 = XSTRING (it->string)->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2501 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2502 it->stop_charpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2503 it->string_from_display_prop_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2504 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2505 else if (CONSP (value) && EQ (XCAR (value), Qspace))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2506 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2507 it->method = next_element_from_stretch;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2508 it->object = value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2509 it->current.pos = it->position = start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2510 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2511 #ifdef HAVE_WINDOW_SYSTEM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2512 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2513 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2514 it->what = IT_IMAGE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2515 it->image_id = lookup_image (it->f, value);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2516 it->position = start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2517 it->object = NILP (object) ? it->w->buffer : object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2518 it->method = next_element_from_image;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2519
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2520 /* Say that we don't have consumed the characters with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2521 `display' property yet. The call to pop_it in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2522 set_iterator_to_next will clean this up. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2523 *position = start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2524 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2525 #endif /* HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2526 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2527 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2528
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2529 return space_or_image_found_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2530 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2531
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2532
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2533
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2534 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2535 Overlay strings
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2536 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2537
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2538 /* The following structure is used to record overlay strings for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2539 later sorting in load_overlay_strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2540
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2541 struct overlay_entry
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2542 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2543 Lisp_Object string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2544 int priority;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2545 int after_string_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2546 };
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2547
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2548
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2549 /* Set up iterator IT from overlay strings at its current position.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2550 Called from handle_stop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2551
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2552 static enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2553 handle_overlay_change (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2554 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2555 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2556 /* Overlays are handled in current_buffer only. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2557 if (STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2558 return HANDLED_NORMALLY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2559 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2560 return (get_overlay_strings (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2561 ? HANDLED_RECOMPUTE_PROPS
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2562 : HANDLED_NORMALLY);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2563 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2564
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2565
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2566 /* Set up the next overlay string for delivery by IT, if there is an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2567 overlay string to deliver. Called by set_iterator_to_next when the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2568 end of the current overlay string is reached. If there are more
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2569 overlay strings to display, IT->string and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2570 IT->current.overlay_string_index are set appropriately here.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2571 Otherwise IT->string is set to nil. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2572
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2573 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2574 next_overlay_string (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2575 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2576 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2577 ++it->current.overlay_string_index;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2578 if (it->current.overlay_string_index == it->n_overlay_strings)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2579 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2580 /* No more overlay strings. Restore IT's settings to what
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2581 they were before overlay strings were processed, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2582 continue to deliver from current_buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2583 pop_it (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2584 xassert (it->stop_charpos >= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2585 && it->stop_charpos <= it->end_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2586 it->string = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2587 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2588 SET_TEXT_POS (it->current.string_pos, -1, -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2589 it->n_overlay_strings = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2590 it->method = next_element_from_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2591 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2592 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2593 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2594 /* There are more overlay strings to process. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2595 IT->current.overlay_string_index has advanced to a position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2596 where we must load IT->overlay_strings with more strings, do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2597 it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2598 int i = it->current.overlay_string_index % OVERLAY_STRING_CHUNK_SIZE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2599
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2600 if (it->current.overlay_string_index && i == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2601 load_overlay_strings (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2602
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2603 /* Initialize IT to deliver display elements from the overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2604 string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2605 it->string = it->overlay_strings[i];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2606 it->multibyte_p = STRING_MULTIBYTE (it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2607 SET_TEXT_POS (it->current.string_pos, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2608 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2609 it->stop_charpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2610 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2611
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2612 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2613 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2614
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2615
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2616 /* Compare two overlay_entry structures E1 and E2. Used as a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2617 comparison function for qsort in load_overlay_strings. Overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2618 strings for the same position are sorted so that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2619
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2620 1. All after-strings come in front of before-strings.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2621
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2622 2. Within after-strings, strings are sorted so that overlay strings
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2623 from overlays with higher priorities come first.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2624
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2625 2. Within before-strings, strings are sorted so that overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2626 strings from overlays with higher priorities come last.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2627
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2628 Value is analogous to strcmp. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2629
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2630
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2631 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2632 compare_overlay_entries (e1, e2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2633 void *e1, *e2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2634 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2635 struct overlay_entry *entry1 = (struct overlay_entry *) e1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2636 struct overlay_entry *entry2 = (struct overlay_entry *) e2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2637 int result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2638
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2639 if (entry1->after_string_p != entry2->after_string_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2640 /* Let after-strings appear in front of before-strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2641 result = entry1->after_string_p ? -1 : 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2642 else if (entry1->after_string_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2643 /* After-strings sorted in order of decreasing priority. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2644 result = entry2->priority - entry1->priority;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2645 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2646 /* Before-strings sorted in order of increasing priority. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2647 result = entry1->priority - entry2->priority;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2648
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2649 return result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2650 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2651
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2652
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2653 /* Load the vector IT->overlay_strings with overlay strings from IT's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2654 current buffer position. Set IT->n_overlays to the total number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2655 overlay strings found.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2656
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2657 Overlay strings are processed OVERLAY_STRING_CHUNK_SIZE strings at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2658 a time. On entry into load_overlay_strings,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2659 IT->current.overlay_string_index gives the number of overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2660 strings that have already been loaded by previous calls to this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2661 function.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2662
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2663 Overlay strings are sorted so that after-string strings come in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2664 front of before-string strings. Within before and after-strings,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2665 strings are sorted by overlay priority. See also function
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2666 compare_overlay_entries. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2667
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2668 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2669 load_overlay_strings (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2670 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2671 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2672 extern Lisp_Object Qafter_string, Qbefore_string, Qwindow, Qpriority;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2673 Lisp_Object ov, overlay, window, str;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2674 int start, end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2675 int size = 20;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2676 int n = 0, i, j;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2677 struct overlay_entry *entries
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2678 = (struct overlay_entry *) alloca (size * sizeof *entries);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2679
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2680 /* Append the overlay string STRING of overlay OVERLAY to vector
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2681 `entries' which has size `size' and currently contains `n'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2682 elements. AFTER_P non-zero means STRING is an after-string of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2683 OVERLAY. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2684 #define RECORD_OVERLAY_STRING(OVERLAY, STRING, AFTER_P) \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2685 do \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2686 { \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2687 Lisp_Object priority; \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2688 \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2689 if (n == size) \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2690 { \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2691 int new_size = 2 * size; \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2692 struct overlay_entry *old = entries; \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2693 entries = \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2694 (struct overlay_entry *) alloca (new_size \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2695 * sizeof *entries); \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2696 bcopy (old, entries, size * sizeof *entries); \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2697 size = new_size; \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2698 } \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2699 \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2700 entries[n].string = (STRING); \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2701 priority = Foverlay_get ((OVERLAY), Qpriority); \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2702 entries[n].priority \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2703 = INTEGERP (priority) ? XFASTINT (priority) : 0; \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2704 entries[n].after_string_p = (AFTER_P); \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2705 ++n; \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2706 } \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2707 while (0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2708
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2709 /* Process overlay before the overlay center. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2710 for (ov = current_buffer->overlays_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2711 CONSP (ov);
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
2712 ov = XCDR (ov))
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
2713 {
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
2714 overlay = XCAR (ov);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2715 xassert (OVERLAYP (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2716 start = OVERLAY_POSITION (OVERLAY_START (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2717 end = OVERLAY_POSITION (OVERLAY_END (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2718
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2719 if (end < IT_CHARPOS (*it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2720 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2721
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2722 /* Skip this overlay if it doesn't start or end at IT's current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2723 position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2724 if (end != IT_CHARPOS (*it) && start != IT_CHARPOS (*it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2725 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2726
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2727 /* Skip this overlay if it doesn't apply to IT->w. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2728 window = Foverlay_get (overlay, Qwindow);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2729 if (WINDOWP (window) && XWINDOW (window) != it->w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2730 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2731
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2732 /* If overlay has a non-empty before-string, record it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2733 if (start == IT_CHARPOS (*it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2734 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2735 && XSTRING (str)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2736 RECORD_OVERLAY_STRING (overlay, str, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2737
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2738 /* If overlay has a non-empty after-string, record it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2739 if (end == IT_CHARPOS (*it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2740 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2741 && XSTRING (str)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2742 RECORD_OVERLAY_STRING (overlay, str, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2743 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2744
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2745 /* Process overlays after the overlay center. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2746 for (ov = current_buffer->overlays_after;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2747 CONSP (ov);
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
2748 ov = XCDR (ov))
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
2749 {
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
2750 overlay = XCAR (ov);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2751 xassert (OVERLAYP (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2752 start = OVERLAY_POSITION (OVERLAY_START (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2753 end = OVERLAY_POSITION (OVERLAY_END (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2754
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2755 if (start > IT_CHARPOS (*it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2756 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2757
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2758 /* Skip this overlay if it doesn't start or end at IT's current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2759 position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2760 if (end != IT_CHARPOS (*it) && start != IT_CHARPOS (*it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2761 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2762
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2763 /* Skip this overlay if it doesn't apply to IT->w. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2764 window = Foverlay_get (overlay, Qwindow);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2765 if (WINDOWP (window) && XWINDOW (window) != it->w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2766 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2767
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2768 /* If overlay has a non-empty before-string, record it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2769 if (start == IT_CHARPOS (*it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2770 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2771 && XSTRING (str)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2772 RECORD_OVERLAY_STRING (overlay, str, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2773
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2774 /* If overlay has a non-empty after-string, record it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2775 if (end == IT_CHARPOS (*it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2776 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2777 && XSTRING (str)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2778 RECORD_OVERLAY_STRING (overlay, str, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2779 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2780
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2781 #undef RECORD_OVERLAY_STRING
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2782
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2783 /* Sort entries. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2784 qsort (entries, n, sizeof *entries, compare_overlay_entries);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2785
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2786 /* Record the total number of strings to process. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2787 it->n_overlay_strings = n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2788
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2789 /* IT->current.overlay_string_index is the number of overlay strings
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2790 that have already been consumed by IT. Copy some of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2791 remaining overlay strings to IT->overlay_strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2792 i = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2793 j = it->current.overlay_string_index;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2794 while (i < OVERLAY_STRING_CHUNK_SIZE && j < n)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2795 it->overlay_strings[i++] = entries[j++].string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2796
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2797 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2798 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2799
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2800
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2801 /* Get the first chunk of overlay strings at IT's current buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2802 position. Value is non-zero if at least one overlay string was
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2803 found. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2804
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2805 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2806 get_overlay_strings (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2807 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2808 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2809 /* Get the first OVERLAY_STRING_CHUNK_SIZE overlay strings to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2810 process. This fills IT->overlay_strings with strings, and sets
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2811 IT->n_overlay_strings to the total number of strings to process.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2812 IT->pos.overlay_string_index has to be set temporarily to zero
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2813 because load_overlay_strings needs this; it must be set to -1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2814 when no overlay strings are found because a zero value would
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2815 indicate a position in the first overlay string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2816 it->current.overlay_string_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2817 load_overlay_strings (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2818
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2819 /* If we found overlay strings, set up IT to deliver display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2820 elements from the first one. Otherwise set up IT to deliver
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2821 from current_buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2822 if (it->n_overlay_strings)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2823 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2824 /* Make sure we know settings in current_buffer, so that we can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2825 restore meaningful values when we're done with the overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2826 strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2827 compute_stop_pos (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2828 xassert (it->face_id >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2829
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2830 /* Save IT's settings. They are restored after all overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2831 strings have been processed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2832 xassert (it->sp == 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2833 push_it (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2834
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2835 /* Set up IT to deliver display elements from the first overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2836 string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2837 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2838 it->stop_charpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2839 it->string = it->overlay_strings[0];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2840 it->multibyte_p = STRING_MULTIBYTE (it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2841 xassert (STRINGP (it->string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2842 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2843 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2844 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2845 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2846 it->string = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2847 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2848 it->method = next_element_from_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2849 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2850
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2851 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2852
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2853 /* Value is non-zero if we found at least one overlay string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2854 return STRINGP (it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2855 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2856
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2857
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2858
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2859 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2860 Saving and restoring state
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2861 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2862
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2863 /* Save current settings of IT on IT->stack. Called, for example,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2864 before setting up IT for an overlay string, to be able to restore
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2865 IT's settings to what they were after the overlay string has been
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2866 processed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2867
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2868 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2869 push_it (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2870 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2871 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2872 struct iterator_stack_entry *p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2873
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2874 xassert (it->sp < 2);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2875 p = it->stack + it->sp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2876
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2877 p->stop_charpos = it->stop_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2878 xassert (it->face_id >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2879 p->face_id = it->face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2880 p->string = it->string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2881 p->pos = it->current;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2882 p->end_charpos = it->end_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2883 p->string_nchars = it->string_nchars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2884 p->area = it->area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2885 p->multibyte_p = it->multibyte_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2886 p->space_width = it->space_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2887 p->font_height = it->font_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2888 p->voffset = it->voffset;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2889 p->string_from_display_prop_p = it->string_from_display_prop_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2890 ++it->sp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2891 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2892
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2893
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2894 /* Restore IT's settings from IT->stack. Called, for example, when no
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2895 more overlay strings must be processed, and we return to delivering
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2896 display elements from a buffer, or when the end of a string from a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2897 `display' property is reached and we return to delivering display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2898 elements from an overlay string, or from a buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2899
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2900 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2901 pop_it (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2902 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2903 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2904 struct iterator_stack_entry *p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2905
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2906 xassert (it->sp > 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2907 --it->sp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2908 p = it->stack + it->sp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2909 it->stop_charpos = p->stop_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2910 it->face_id = p->face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2911 it->string = p->string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2912 it->current = p->pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2913 it->end_charpos = p->end_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2914 it->string_nchars = p->string_nchars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2915 it->area = p->area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2916 it->multibyte_p = p->multibyte_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2917 it->space_width = p->space_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2918 it->font_height = p->font_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2919 it->voffset = p->voffset;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2920 it->string_from_display_prop_p = p->string_from_display_prop_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2921 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2922
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2923
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2924
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2925 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2926 Moving over lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2927 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2928
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2929 /* Set IT's current position to the previous line start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2930
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2931 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2932 back_to_previous_line_start (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2933 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2934 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2935 IT_CHARPOS (*it) = find_next_newline_no_quit (IT_CHARPOS (*it) - 1, -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2936 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2937 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2938
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2939
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2940 /* Set IT's current position to the next line start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2941
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2942 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2943 forward_to_next_line_start (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2944 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2945 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2946 IT_CHARPOS (*it) = find_next_newline_no_quit (IT_CHARPOS (*it), 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2947 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2948 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2949
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2950
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2951 /* Set IT's current position to the previous visible line start. Skip
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2952 invisible text that is so either due to text properties or due to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2953 selective display. Caution: this does not change IT->current_x and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2954 IT->hpos. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2955
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2956 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2957 back_to_previous_visible_line_start (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2958 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2959 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2960 int visible_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2961
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2962 /* Go back one newline if not on BEGV already. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2963 if (IT_CHARPOS (*it) > BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2964 back_to_previous_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2965
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2966 /* Move over lines that are invisible because of selective display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2967 or text properties. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2968 while (IT_CHARPOS (*it) > BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2969 && !visible_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2970 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2971 visible_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2972
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2973 /* If selective > 0, then lines indented more than that values
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2974 are invisible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2975 if (it->selective > 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2976 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2977 it->selective))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2978 visible_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2979 #ifdef USE_TEXT_PROPERTIES
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2980 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2981 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2982 Lisp_Object prop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2983
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2984 prop = Fget_char_property (IT_CHARPOS (*it), Qinvisible, it->window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2985 if (TEXT_PROP_MEANS_INVISIBLE (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2986 visible_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2987 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2988 #endif /* USE_TEXT_PROPERTIES */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2989
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2990 /* Back one more newline if the current one is invisible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2991 if (!visible_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2992 back_to_previous_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2993 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2994
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2995 xassert (IT_CHARPOS (*it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2996 xassert (IT_CHARPOS (*it) == BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2997 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2998 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2999 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3000
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3001
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3002 /* Reseat iterator IT at the previous visible line start. Skip
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3003 invisible text that is so either due to text properties or due to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3004 selective display. At the end, update IT's overlay information,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3005 face information etc. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3006
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3007 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3008 reseat_at_previous_visible_line_start (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3009 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3010 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3011 back_to_previous_visible_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3012 reseat (it, it->current.pos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3013 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3014 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3015
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3016
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3017 /* Reseat iterator IT on the next visible line start in the current
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3018 buffer. ON_NEWLINE_P non-zero means position IT on the newline
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3019 preceding the line start. Skip over invisible text that is so
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3020 because of selective display. Compute faces, overlays etc at the
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3021 new position. Note that this function does not skip over text that
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3022 is invisible because of text properties. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3023
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3024 static void
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3025 reseat_at_next_visible_line_start (it, on_newline_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3026 struct it *it;
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3027 int on_newline_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3028 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3029 /* Restore the buffer position when currently not delivering display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3030 elements from the current buffer. This is the case, for example,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3031 when called at the end of a truncated overlay string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3032 while (it->sp)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3033 pop_it (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3034 it->method = next_element_from_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3035
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3036 /* Otherwise, scan_buffer would not work. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3037 if (IT_CHARPOS (*it) < ZV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3038 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3039 /* If on a newline, advance past it. Otherwise, find the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3040 newline which automatically gives us the position following
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3041 the newline. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3042 if (FETCH_BYTE (IT_BYTEPOS (*it)) == '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3043 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3044 ++IT_CHARPOS (*it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3045 ++IT_BYTEPOS (*it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3046 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3047 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3048 forward_to_next_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3049
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3050 /* We must either have reached the end of the buffer or end up
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3051 after a newline. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3052 xassert (IT_CHARPOS (*it) == ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3053 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3054
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3055 /* Skip over lines that are invisible because they are indented
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3056 more than the value of IT->selective. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3057 if (it->selective > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3058 while (IT_CHARPOS (*it) < ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3059 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3060 it->selective))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3061 forward_to_next_line_start (it);
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3062
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3063 /* Position on the newline if we should. */
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3064 if (on_newline_p && IT_CHARPOS (*it) > BEGV)
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3065 {
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3066 --IT_CHARPOS (*it);
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3067 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it));
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3068 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3069
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3070 /* Set the iterator there. The 0 as the last parameter of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3071 reseat means don't force a text property lookup. The lookup
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3072 is then only done if we've skipped past the iterator's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3073 check_charpos'es. This optimization is important because
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3074 text property lookups tend to be expensive. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3075 reseat (it, it->current.pos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3076 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3077
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3078 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3079 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3080
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3081
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3082
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3083 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3084 Changing an iterator's position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3085 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3086
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3087 /* Change IT's current position to POS in current_buffer. If FORCE_P
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3088 is non-zero, always check for text properties at the new position.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3089 Otherwise, text properties are only looked up if POS >=
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3090 IT->check_charpos of a property. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3091
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3092 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3093 reseat (it, pos, force_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3094 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3095 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3096 int force_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3097 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3098 int original_pos = IT_CHARPOS (*it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3099
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3100 reseat_1 (it, pos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3101
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3102 /* Determine where to check text properties. Avoid doing it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3103 where possible because text property lookup is very expensive. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3104 if (force_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3105 || CHARPOS (pos) > it->stop_charpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3106 || CHARPOS (pos) < original_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3107 handle_stop (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3108
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3109 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3110 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3111
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3112
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3113 /* Change IT's buffer position to POS. SET_STOP_P non-zero means set
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3114 IT->stop_pos to POS, also. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3115
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3116 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3117 reseat_1 (it, pos, set_stop_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3118 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3119 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3120 int set_stop_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3121 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3122 /* Don't call this function when scanning a C string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3123 xassert (it->s == NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3124
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3125 /* POS must be a reasonable value. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3126 xassert (CHARPOS (pos) >= BEGV && CHARPOS (pos) <= ZV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3127
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3128 it->current.pos = it->position = pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3129 XSETBUFFER (it->object, current_buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3130 it->dpvec = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3131 it->current.dpvec_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3132 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3133 IT_STRING_CHARPOS (*it) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3134 IT_STRING_BYTEPOS (*it) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3135 it->string = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3136 it->method = next_element_from_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3137 it->sp = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3138
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3139 if (set_stop_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3140 it->stop_charpos = CHARPOS (pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3141 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3142
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3143
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3144 /* Set up IT for displaying a string, starting at CHARPOS in window W.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3145 If S is non-null, it is a C string to iterate over. Otherwise,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3146 STRING gives a Lisp string to iterate over.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3147
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3148 If PRECISION > 0, don't return more then PRECISION number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3149 characters from the string.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3150
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3151 If FIELD_WIDTH > 0, return padding spaces until FIELD_WIDTH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3152 characters have been returned. FIELD_WIDTH < 0 means an infinite
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3153 field width.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3154
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3155 MULTIBYTE = 0 means disable processing of multibyte characters,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3156 MULTIBYTE > 0 means enable it,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3157 MULTIBYTE < 0 means use IT->multibyte_p.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3158
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3159 IT must be initialized via a prior call to init_iterator before
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3160 calling this function. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3161
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3162 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3163 reseat_to_string (it, s, string, charpos, precision, field_width, multibyte)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3164 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3165 unsigned char *s;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3166 Lisp_Object string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3167 int charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3168 int precision, field_width, multibyte;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3169 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3170 /* No region in strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3171 it->region_beg_charpos = it->region_end_charpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3172
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3173 /* No text property checks performed by default, but see below. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3174 it->stop_charpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3175
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3176 /* Set iterator position and end position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3177 bzero (&it->current, sizeof it->current);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3178 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3179 it->current.dpvec_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3180 it->charset = CHARSET_ASCII;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3181 xassert (charpos >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3182
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3183 /* Use the setting of MULTIBYTE if specified. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3184 if (multibyte >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3185 it->multibyte_p = multibyte > 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3186
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3187 if (s == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3188 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3189 xassert (STRINGP (string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3190 it->string = string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3191 it->s = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3192 it->end_charpos = it->string_nchars = XSTRING (string)->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3193 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3194 it->current.string_pos = string_pos (charpos, string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3195 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3196 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3197 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3198 it->s = s;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3199 it->string = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3200
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3201 /* Note that we use IT->current.pos, not it->current.string_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3202 for displaying C strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3203 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3204 if (it->multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3205 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3206 it->current.pos = c_string_pos (charpos, s, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3207 it->end_charpos = it->string_nchars = number_of_chars (s, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3208 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3209 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3210 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3211 IT_CHARPOS (*it) = IT_BYTEPOS (*it) = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3212 it->end_charpos = it->string_nchars = strlen (s);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3213 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3214
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3215 it->method = next_element_from_c_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3216 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3217
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3218 /* PRECISION > 0 means don't return more than PRECISION characters
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3219 from the string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3220 if (precision > 0 && it->end_charpos - charpos > precision)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3221 it->end_charpos = it->string_nchars = charpos + precision;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3222
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3223 /* FIELD_WIDTH > 0 means pad with spaces until FIELD_WIDTH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3224 characters have been returned. FIELD_WIDTH == 0 means don't pad,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3225 FIELD_WIDTH < 0 means infinite field width. This is useful for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3226 padding with `-' at the end of a mode line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3227 if (field_width < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3228 field_width = INFINITY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3229 if (field_width > it->end_charpos - charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3230 it->end_charpos = charpos + field_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3231
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3232 /* Use the standard display table for displaying strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3233 if (DISP_TABLE_P (Vstandard_display_table))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3234 it->dp = XCHAR_TABLE (Vstandard_display_table);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3235
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3236 it->stop_charpos = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3237 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3238 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3239
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3240
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3241
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3242 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3243 Iteration
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3244 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3245
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3246 /* Load IT's display element fields with information about the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3247 display element from the current position of IT. Value is zero if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3248 end of buffer (or C string) is reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3249
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3250 int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3251 get_next_display_element (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3252 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3253 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3254 /* Non-zero means that we found an display element. Zero means that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3255 we hit the end of what we iterate over. Performance note: the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3256 function pointer `method' used here turns out to be faster than
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3257 using a sequence of if-statements. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3258 int success_p = (*it->method) (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3259 int charset;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3260
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3261 if (it->what == IT_CHARACTER)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3262 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3263 /* Map via display table or translate control characters.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3264 IT->c, IT->len etc. have been set to the next character by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3265 the function call above. If we have a display table, and it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3266 contains an entry for IT->c, translate it. Don't do this if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3267 IT->c itself comes from a display table, otherwise we could
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3268 end up in an infinite recursion. (An alternative could be to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3269 count the recursion depth of this function and signal an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3270 error when a certain maximum depth is reached.) Is it worth
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3271 it? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3272 if (success_p && it->dpvec == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3273 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3274 Lisp_Object dv;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3275
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3276 if (it->dp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3277 && (dv = DISP_CHAR_VECTOR (it->dp, it->c),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3278 VECTORP (dv)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3279 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3280 struct Lisp_Vector *v = XVECTOR (dv);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3281
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3282 /* Return the first character from the display table
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3283 entry, if not empty. If empty, don't display the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3284 current character. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3285 if (v->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3286 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3287 it->dpvec_char_len = it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3288 it->dpvec = v->contents;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3289 it->dpend = v->contents + v->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3290 it->current.dpvec_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3291 it->method = next_element_from_display_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3292 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3293
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3294 success_p = get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3295 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3296
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3297 /* Translate control characters into `\003' or `^C' form.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3298 Control characters coming from a display table entry are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3299 currently not translated because we use IT->dpvec to hold
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3300 the translation. This could easily be changed but I
25500
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3301 don't believe that it is worth doing.
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3302
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3303 Non-printable multibyte characters are also translated
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3304 octal form. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3305 else if ((it->c < ' '
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3306 && (it->area != TEXT_AREA
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
3307 || (it->c != '\n' && it->c != '\t')))
25063
7c69e1001e35 (get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents: 25012
diff changeset
3308 || (it->c >= 127
25500
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3309 && it->len == 1)
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3310 || !CHAR_PRINTABLE_P (it->c))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3311 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3312 /* IT->c is a control character which must be displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3313 either as '\003' or as `^C' where the '\\' and '^'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3314 can be defined in the display table. Fill
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3315 IT->ctl_chars with glyphs for what we have to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3316 display. Then, set IT->dpvec to these glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3317 GLYPH g;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3318
25063
7c69e1001e35 (get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents: 25012
diff changeset
3319 if (it->c < 128 && it->ctl_arrow_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3320 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3321 /* Set IT->ctl_chars[0] to the glyph for `^'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3322 if (it->dp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3323 && INTEGERP (DISP_CTRL_GLYPH (it->dp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3324 && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (it->dp))))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3325 g = XINT (DISP_CTRL_GLYPH (it->dp));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3326 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3327 g = FAST_MAKE_GLYPH ('^', 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3328 XSETINT (it->ctl_chars[0], g);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3329
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3330 g = FAST_MAKE_GLYPH (it->c ^ 0100, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3331 XSETINT (it->ctl_chars[1], g);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3332
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3333 /* Set up IT->dpvec and return first character from it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3334 it->dpvec_char_len = it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3335 it->dpvec = it->ctl_chars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3336 it->dpend = it->dpvec + 2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3337 it->current.dpvec_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3338 it->method = next_element_from_display_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3339 get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3340 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3341 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3342 {
25500
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3343 unsigned char work[4], *str;
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3344 int len = CHAR_STRING (it->c, work, str);
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3345 int i;
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3346 GLYPH escape_glyph;
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3347
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3348 /* Set IT->ctl_chars[0] to the glyph for `\\'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3349 if (it->dp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3350 && INTEGERP (DISP_ESCAPE_GLYPH (it->dp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3351 && GLYPH_CHAR_VALID_P (XFASTINT (DISP_ESCAPE_GLYPH (it->dp))))
25500
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3352 escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3353 else
25500
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3354 escape_glyph = FAST_MAKE_GLYPH ('\\', 0);
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3355
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3356 for (i = 0; i < len; i++)
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3357 {
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3358 XSETINT (it->ctl_chars[i * 4], escape_glyph);
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3359 /* Insert three more glyphs into IT->ctl_chars for
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3360 the octal display of the character. */
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3361 g = FAST_MAKE_GLYPH (((str[i] >> 6) & 7) + '0', 0);
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3362 XSETINT (it->ctl_chars[i * 4 + 1], g);
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3363 g = FAST_MAKE_GLYPH (((str[i] >> 3) & 7) + '0', 0);
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3364 XSETINT (it->ctl_chars[i * 4 + 2], g);
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3365 g = FAST_MAKE_GLYPH ((str[i] & 7) + '0', 0);
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3366 XSETINT (it->ctl_chars[i * 4 + 3], g);
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3367 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3368
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3369 /* Set up IT->dpvec and return the first character
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3370 from it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3371 it->dpvec_char_len = it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3372 it->dpvec = it->ctl_chars;
25500
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3373 it->dpend = it->dpvec + len * 4;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3374 it->current.dpvec_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3375 it->method = next_element_from_display_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3376 get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3377 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3378 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3379 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3380
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3381 /* Adjust face id if charset changes. There are no charset
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3382 changes in unibyte text because Emacs' charsets are not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3383 applicable there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3384 if (it->multibyte_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3385 && success_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3386 && (charset = CHAR_CHARSET (it->c),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3387 charset != it->charset))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3388 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3389 it->charset = charset;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3390 it->face_id = FACE_FOR_CHARSET (it->f, it->face_id, charset);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3391 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3392 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3393
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3394 /* Is this character the last one of a run of characters with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3395 box? If yes, set IT->end_of_box_run_p to 1. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3396 if (it->face_box_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3397 && it->s == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3398 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3399 int face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3400 struct face *face;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3401
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3402 it->end_of_box_run_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3403 = ((face_id = face_after_it_pos (it),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3404 face_id != it->face_id)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3405 && (face = FACE_FROM_ID (it->f, face_id),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3406 face->box == FACE_NO_BOX));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3407 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3408
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3409 /* Value is 0 if end of buffer or string reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3410 return success_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3411 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3412
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3413
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3414 /* Move IT to the next display element.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3415
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3416 Functions get_next_display_element and set_iterator_to_next are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3417 separate because I find this arrangement easier to handle than a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3418 get_next_display_element function that also increments IT's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3419 position. The way it is we can first look at an iterator's current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3420 display element, decide whether it fits on a line, and if it does,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3421 increment the iterator position. The other way around we probably
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3422 would either need a flag indicating whether the iterator has to be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3423 incremented the next time, or we would have to implement a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3424 decrement position function which would not be easy to write. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3425
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3426 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3427 set_iterator_to_next (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3428 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3429 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3430 if (it->method == next_element_from_buffer)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3431 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3432 /* The current display element of IT is a character from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3433 current_buffer. Advance in the buffer, and maybe skip over
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3434 invisible lines that are so because of selective display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3435 if (ITERATOR_AT_END_OF_LINE_P (it))
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3436 reseat_at_next_visible_line_start (it, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3437 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3438 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3439 xassert (it->len != 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3440 IT_BYTEPOS (*it) += it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3441 IT_CHARPOS (*it) += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3442 xassert (IT_BYTEPOS (*it) == CHAR_TO_BYTE (IT_CHARPOS (*it)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3443 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3444 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3445 else if (it->method == next_element_from_c_string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3446 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3447 /* Current display element of IT is from a C string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3448 IT_BYTEPOS (*it) += it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3449 IT_CHARPOS (*it) += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3450 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3451 else if (it->method == next_element_from_display_vector)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3452 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3453 /* Current display element of IT is from a display table entry.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3454 Advance in the display table definition. Reset it to null if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3455 end reached, and continue with characters from buffers/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3456 strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3457 ++it->current.dpvec_index;
25197
fbe149852f1c (set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents: 25188
diff changeset
3458
fbe149852f1c (set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents: 25188
diff changeset
3459 /* Restore face and charset of the iterator to what they were
fbe149852f1c (set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents: 25188
diff changeset
3460 before the display vector entry (these entries may contain
fbe149852f1c (set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents: 25188
diff changeset
3461 faces, and of course characters of different charsets). */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3462 it->face_id = it->saved_face_id;
25197
fbe149852f1c (set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents: 25188
diff changeset
3463 it->charset = FACE_FROM_ID (it->f, it->face_id)->charset;
fbe149852f1c (set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents: 25188
diff changeset
3464
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3465 if (it->dpvec + it->current.dpvec_index == it->dpend)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3466 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3467 if (it->s)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3468 it->method = next_element_from_c_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3469 else if (STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3470 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3471 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3472 it->method = next_element_from_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3473
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3474 it->dpvec = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3475 it->current.dpvec_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3476
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3477 /* Skip over characters which were displayed via IT->dpvec. */
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3478 if (it->dpvec_char_len < 0)
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3479 reseat_at_next_visible_line_start (it, 1);
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3480 else if (it->dpvec_char_len > 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3481 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3482 it->len = it->dpvec_char_len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3483 set_iterator_to_next (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3484 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3485 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3486 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3487 else if (it->method == next_element_from_string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3488 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3489 /* Current display element is a character from a Lisp string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3490 xassert (it->s == NULL && STRINGP (it->string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3491 IT_STRING_BYTEPOS (*it) += it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3492 IT_STRING_CHARPOS (*it) += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3493
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3494 consider_string_end:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3495
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3496 if (it->current.overlay_string_index >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3497 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3498 /* IT->string is an overlay string. Advance to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3499 next, if there is one. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3500 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3501 next_overlay_string (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3502 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3503 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3504 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3505 /* IT->string is not an overlay string. If we reached
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3506 its end, and there is something on IT->stack, proceed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3507 with what is on the stack. This can be either another
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3508 string, this time an overlay string, or a buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3509 if (IT_STRING_CHARPOS (*it) == XSTRING (it->string)->size
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3510 && it->sp > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3511 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3512 pop_it (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3513 if (!STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3514 it->method = next_element_from_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3515 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3516 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3517 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3518 else if (it->method == next_element_from_image
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3519 || it->method == next_element_from_stretch)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3520 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3521 /* The position etc with which we have to proceed are on
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3522 the stack. The position may be at the end of a string,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3523 if the `display' property takes up the whole string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3524 pop_it (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3525 it->image_id = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3526 if (STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3527 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3528 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3529 goto consider_string_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3530 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3531 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3532 it->method = next_element_from_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3533 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3534 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3535 /* There are no other methods defined, so this should be a bug. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3536 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3537
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3538 /* Reset flags indicating start and end of a sequence of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3539 characters with box. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3540 it->start_of_box_run_p = it->end_of_box_run_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3541
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3542 xassert (it->method != next_element_from_string
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3543 || (STRINGP (it->string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3544 && IT_STRING_CHARPOS (*it) >= 0));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3545 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3546
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3547
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3548 /* Load IT's display element fields with information about the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3549 display element which comes from a display table entry or from the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3550 result of translating a control character to one of the forms `^C'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3551 or `\003'. IT->dpvec holds the glyphs to return as characters. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3552
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3553 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3554 next_element_from_display_vector (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3555 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3556 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3557 /* Precondition. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3558 xassert (it->dpvec && it->current.dpvec_index >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3559
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3560 /* Remember the current face id in case glyphs specify faces.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3561 IT's face is restored in set_iterator_to_next. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3562 it->saved_face_id = it->face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3563
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3564 if (INTEGERP (*it->dpvec)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3565 && GLYPH_CHAR_VALID_P (XFASTINT (*it->dpvec)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3566 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3567 int lface_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3568 GLYPH g;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3569
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3570 g = XFASTINT (it->dpvec[it->current.dpvec_index]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3571 it->c = FAST_GLYPH_CHAR (g);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3572 it->len = CHAR_LEN (it->c);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3573
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3574 /* The entry may contain a face id to use. Such a face id is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3575 the id of a Lisp face, not a realized face. A face id of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3576 zero means no face. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3577 lface_id = FAST_GLYPH_FACE (g);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3578 if (lface_id)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3579 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3580 int face_id = ascii_face_of_lisp_face (it->f, lface_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3581 if (face_id >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3582 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3583 it->face_id = face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3584 it->charset = CHARSET_ASCII;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3585 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3586 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3587 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3588 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3589 /* Display table entry is invalid. Return a space. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3590 it->c = ' ', it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3591
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3592 /* Don't change position and object of the iterator here. They are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3593 still the values of the character that had this display table
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3594 entry or was translated, and that's what we want. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3595 it->what = IT_CHARACTER;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3596 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3597 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3598
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3599
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3600 /* Load IT with the next display element from Lisp string IT->string.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3601 IT->current.string_pos is the current position within the string.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3602 If IT->current.overlay_string_index >= 0, the Lisp string is an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3603 overlay string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3604
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3605 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3606 next_element_from_string (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3607 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3608 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3609 struct text_pos position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3610
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3611 xassert (STRINGP (it->string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3612 xassert (IT_STRING_CHARPOS (*it) >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3613 position = it->current.string_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3614
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3615 /* Time to check for invisible text? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3616 if (IT_STRING_CHARPOS (*it) < it->end_charpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3617 && IT_STRING_CHARPOS (*it) == it->stop_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3618 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3619 handle_stop (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3620
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3621 /* Since a handler may have changed IT->method, we must
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3622 recurse here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3623 return get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3624 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3625
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3626 if (it->current.overlay_string_index >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3627 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3628 /* Get the next character from an overlay string. In overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3629 strings, There is no field width or padding with spaces to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3630 do. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3631 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3632 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3633 it->what = IT_EOB;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3634 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3635 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3636 else if (STRING_MULTIBYTE (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3637 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3638 int remaining = (STRING_BYTES (XSTRING (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3639 - IT_STRING_BYTEPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3640 unsigned char *s = (XSTRING (it->string)->data
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3641 + IT_STRING_BYTEPOS (*it));
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
3642 it->c = string_char_and_length (s, remaining, &it->len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3643 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3644 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3645 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3646 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3647 it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3648 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3649 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3650 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3651 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3652 /* Get the next character from a Lisp string that is not an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3653 overlay string. Such strings come from the mode line, for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3654 example. We may have to pad with spaces, or truncate the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3655 string. See also next_element_from_c_string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3656 if (IT_STRING_CHARPOS (*it) >= it->end_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3657 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3658 it->what = IT_EOB;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3659 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3660 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3661 else if (IT_STRING_CHARPOS (*it) >= it->string_nchars)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3662 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3663 /* Pad with spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3664 it->c = ' ', it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3665 CHARPOS (position) = BYTEPOS (position) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3666 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3667 else if (STRING_MULTIBYTE (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3668 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3669 int maxlen = (STRING_BYTES (XSTRING (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3670 - IT_STRING_BYTEPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3671 unsigned char *s = (XSTRING (it->string)->data
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3672 + IT_STRING_BYTEPOS (*it));
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
3673 it->c = string_char_and_length (s, maxlen, &it->len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3674 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3675 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3676 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3677 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3678 it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3679 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3680 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3681
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3682 /* Record what we have and where it came from. Note that we store a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3683 buffer position in IT->position although it could arguably be a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3684 string position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3685 it->what = IT_CHARACTER;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3686 it->object = it->string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3687 it->position = position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3688 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3689 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3690
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3691
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3692 /* Load IT with next display element from C string IT->s.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3693 IT->string_nchars is the maximum number of characters to return
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3694 from the string. IT->end_charpos may be greater than
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3695 IT->string_nchars when this function is called, in which case we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3696 may have to return padding spaces. Value is zero if end of string
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3697 reached, including padding spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3698
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3699 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3700 next_element_from_c_string (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3701 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3702 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3703 int success_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3704
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3705 xassert (it->s);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3706 it->what = IT_CHARACTER;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3707 BYTEPOS (it->position) = CHARPOS (it->position) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3708 it->object = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3709
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3710 /* IT's position can be greater IT->string_nchars in case a field
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3711 width or precision has been specified when the iterator was
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3712 initialized. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3713 if (IT_CHARPOS (*it) >= it->end_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3714 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3715 /* End of the game. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3716 it->what = IT_EOB;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3717 success_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3718 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3719 else if (IT_CHARPOS (*it) >= it->string_nchars)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3720 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3721 /* Pad with spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3722 it->c = ' ', it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3723 BYTEPOS (it->position) = CHARPOS (it->position) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3724 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3725 else if (it->multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3726 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3727 /* Implementation note: The calls to strlen apparently aren't a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3728 performance problem because there is no noticeable performance
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3729 difference between Emacs running in unibyte or multibyte mode. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3730 int maxlen = strlen (it->s) - IT_BYTEPOS (*it);
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
3731 it->c = string_char_and_length (it->s + IT_BYTEPOS (*it),
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
3732 maxlen, &it->len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3733 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3734 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3735 it->c = it->s[IT_BYTEPOS (*it)], it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3736
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3737 return success_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3738 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3739
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3740
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3741 /* Set up IT to return characters from an ellipsis, if appropriate.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3742 The definition of the ellipsis glyphs may come from a display table
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3743 entry. This function Fills IT with the first glyph from the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3744 ellipsis if an ellipsis is to be displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3745
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3746 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3747 next_element_from_ellipsis (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3748 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3749 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3750 if (it->dp && VECTORP (DISP_INVIS_VECTOR (it->dp)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3751 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3752 /* Use the display table definition for `...'. Invalid glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3753 will be handled by the method returning elements from dpvec. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3754 struct Lisp_Vector *v = XVECTOR (DISP_INVIS_VECTOR (it->dp));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3755 it->dpvec_char_len = it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3756 it->dpvec = v->contents;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3757 it->dpend = v->contents + v->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3758 it->current.dpvec_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3759 it->method = next_element_from_display_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3760 get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3761 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3762 else if (it->selective_display_ellipsis_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3763 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3764 /* Use default `...' which is stored in default_invis_vector. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3765 it->dpvec_char_len = it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3766 it->dpvec = default_invis_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3767 it->dpend = default_invis_vector + 3;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3768 it->current.dpvec_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3769 it->method = next_element_from_display_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3770 get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3771 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3772 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3773
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3774
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3775 /* Deliver an image display element. The iterator IT is already
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3776 filled with image information (done in handle_display_prop). Value
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3777 is always 1. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3778
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3779
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3780 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3781 next_element_from_image (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3782 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3783 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3784 it->what = IT_IMAGE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3785 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3786 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3787
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3788
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3789 /* Fill iterator IT with next display element from a stretch glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3790 property. IT->object is the value of the text property. Value is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3791 always 1. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3792
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3793 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3794 next_element_from_stretch (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3795 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3796 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3797 it->what = IT_STRETCH;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3798 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3799 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3800
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3801
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3802 /* Load IT with the next display element from current_buffer. Value
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3803 is zero if end of buffer reached. IT->stop_charpos is the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3804 position at which to stop and check for text properties or buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3805 end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3806
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3807 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3808 next_element_from_buffer (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3809 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3810 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3811 int success_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3812
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3813 /* Check this assumption, otherwise, we would never enter the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3814 if-statement, below. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3815 xassert (IT_CHARPOS (*it) >= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3816 && IT_CHARPOS (*it) <= it->stop_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3817
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3818 if (IT_CHARPOS (*it) >= it->stop_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3819 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3820 if (IT_CHARPOS (*it) >= it->end_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3821 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3822 int overlay_strings_follow_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3823
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3824 /* End of the game, except when overlay strings follow that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3825 haven't been returned yet. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3826 if (it->overlay_strings_at_end_processed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3827 overlay_strings_follow_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3828 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3829 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3830 it->overlay_strings_at_end_processed_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3831 overlay_strings_follow_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3832 = get_overlay_strings (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3833 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3834
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3835 if (overlay_strings_follow_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3836 success_p = get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3837 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3838 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3839 it->what = IT_EOB;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3840 it->position = it->current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3841 success_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3842 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3843 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3844 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3845 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3846 handle_stop (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3847 return get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3848 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3849 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3850 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3851 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3852 /* No face changes, overlays etc. in sight, so just return a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3853 character from current_buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3854 unsigned char *p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3855
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3856 /* Maybe run the redisplay end trigger hook. Performance note:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3857 This doesn't seem to cost measurable time. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3858 if (it->redisplay_end_trigger_charpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3859 && it->glyph_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3860 && IT_CHARPOS (*it) >= it->redisplay_end_trigger_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3861 run_redisplay_end_trigger_hook (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3862
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3863 /* Get the next character, maybe multibyte. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3864 p = BYTE_POS_ADDR (IT_BYTEPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3865 if (it->multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3866 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3867 int maxlen = ((IT_BYTEPOS (*it) >= GPT_BYTE ? ZV_BYTE : GPT_BYTE)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3868 - IT_BYTEPOS (*it));
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
3869 it->c = string_char_and_length (p, maxlen, &it->len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3870 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3871 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3872 it->c = *p, it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3873
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3874 /* Record what we have and where it came from. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3875 it->what = IT_CHARACTER;;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3876 it->object = it->w->buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3877 it->position = it->current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3878
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3879 /* Normally we return the character found above, except when we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3880 really want to return an ellipsis for selective display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3881 if (it->selective)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3882 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3883 if (it->c == '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3884 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3885 /* A value of selective > 0 means hide lines indented more
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3886 than that number of columns. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3887 if (it->selective > 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3888 && IT_CHARPOS (*it) + 1 < ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3889 && indented_beyond_p (IT_CHARPOS (*it) + 1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3890 IT_BYTEPOS (*it) + 1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3891 it->selective))
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3892 {
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3893 next_element_from_ellipsis (it);
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3894 it->dpvec_char_len = -1;
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3895 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3896 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3897 else if (it->c == '\r' && it->selective == -1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3898 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3899 /* A value of selective == -1 means that everything from the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3900 CR to the end of the line is invisible, with maybe an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3901 ellipsis displayed for it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3902 next_element_from_ellipsis (it);
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3903 it->dpvec_char_len = -1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3904 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3905 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3906 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3907
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3908 /* Value is zero if end of buffer reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3909 xassert (!success_p || it->len > 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3910 return success_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3911 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3912
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3913
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3914 /* Run the redisplay end trigger hook for IT. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3915
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3916 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3917 run_redisplay_end_trigger_hook (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3918 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3919 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3920 Lisp_Object args[3];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3921
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3922 /* IT->glyph_row should be non-null, i.e. we should be actually
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3923 displaying something, or otherwise we should not run the hook. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3924 xassert (it->glyph_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3925
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3926 /* Set up hook arguments. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3927 args[0] = Qredisplay_end_trigger_functions;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3928 args[1] = it->window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3929 XSETINT (args[2], it->redisplay_end_trigger_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3930 it->redisplay_end_trigger_charpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3931
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3932 /* Since we are *trying* to run these functions, don't try to run
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3933 them again, even if they get an error. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3934 it->w->redisplay_end_trigger = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3935 Frun_hook_with_args (3, args);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3936
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3937 /* Notice if it changed the face of the character we are on. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3938 handle_face_prop (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3939 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3940
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3941
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3942
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3943 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3944 Moving an iterator without producing glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3945 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3946
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3947 /* Move iterator IT to a specified buffer or X position within one
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3948 line on the display without producing glyphs.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3949
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3950 Begin to skip at IT's current position. Skip to TO_CHARPOS or TO_X
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3951 whichever is reached first.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3952
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3953 TO_CHARPOS <= 0 means no TO_CHARPOS is specified.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3954
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3955 TO_X < 0 means that no TO_X is specified. TO_X is normally a value
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3956 0 <= TO_X <= IT->last_visible_x. This means in particular, that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3957 TO_X includes the amount by which a window is horizontally
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3958 scrolled.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3959
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3960 Value is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3961
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3962 MOVE_POS_MATCH_OR_ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3963 - when TO_POS or ZV was reached.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3964
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3965 MOVE_X_REACHED
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3966 -when TO_X was reached before TO_POS or ZV were reached.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3967
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3968 MOVE_LINE_CONTINUED
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3969 - when we reached the end of the display area and the line must
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3970 be continued.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3971
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3972 MOVE_LINE_TRUNCATED
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3973 - when we reached the end of the display area and the line is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3974 truncated.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3975
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3976 MOVE_NEWLINE_OR_CR
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3977 - when we stopped at a line end, i.e. a newline or a CR and selective
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3978 display is on. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3979
25693
b12ed057020a (move_it_in_display_line_to): Make type consistent with declaration.
Dave Love <fx@gnu.org>
parents: 25677
diff changeset
3980 static enum move_it_result
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3981 move_it_in_display_line_to (it, to_charpos, to_x, op)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3982 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3983 int to_charpos, to_x, op;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3984 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3985 enum move_it_result result = MOVE_UNDEFINED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3986 struct glyph_row *saved_glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3987
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3988 /* Don't produce glyphs in produce_glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3989 saved_glyph_row = it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3990 it->glyph_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3991
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3992 while (1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3993 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3994 int x, i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3995
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3996 /* Stop when ZV or TO_CHARPOS reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3997 if (!get_next_display_element (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3998 || ((op & MOVE_TO_POS) != 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3999 && BUFFERP (it->object)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4000 && IT_CHARPOS (*it) >= to_charpos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4001 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4002 result = MOVE_POS_MATCH_OR_ZV;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4003 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4004 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4005
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4006 /* The call to produce_glyphs will get the metrics of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4007 display element IT is loaded with. We record in x the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4008 x-position before this display element in case it does not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4009 fit on the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4010 x = it->current_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4011 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4013 if (it->area != TEXT_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4014 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4015 set_iterator_to_next (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4016 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4017 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4018
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4019 /* The number of glyphs we get back in IT->nglyphs will normally
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4020 be 1 except when IT->c is (i) a TAB, or (ii) a multi-glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4021 character on a terminal frame, or (iii) a line end. For the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4022 second case, IT->nglyphs - 1 padding glyphs will be present
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4023 (on X frames, there is only one glyph produced for a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4024 composite character.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4025
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4026 The behavior implemented below means, for continuation lines,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4027 that as many spaces of a TAB as fit on the current line are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4028 displayed there. For terminal frames, as many glyphs of a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4029 multi-glyph character are displayed in the current line, too.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4030 This is what the old redisplay code did, and we keep it that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4031 way. Under X, the whole shape of a complex character must
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4032 fit on the line or it will be completely displayed in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4033 next line.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4034
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4035 Note that both for tabs and padding glyphs, all glyphs have
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4036 the same width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4037 if (it->nglyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4038 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4039 /* More than one glyph or glyph doesn't fit on line. All
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4040 glyphs have the same width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4041 int single_glyph_width = it->pixel_width / it->nglyphs;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4042 int new_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4043
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4044 for (i = 0; i < it->nglyphs; ++i, x = new_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4045 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4046 new_x = x + single_glyph_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4047
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4048 /* We want to leave anything reaching TO_X to the caller. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4049 if ((op & MOVE_TO_X) && new_x > to_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4050 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4051 it->current_x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4052 result = MOVE_X_REACHED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4053 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4054 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4055 else if (/* Lines are continued. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4056 !it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4057 && (/* And glyph doesn't fit on the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4058 new_x > it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4059 /* Or it fits exactly and we're on a window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4060 system frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4061 || (new_x == it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4062 && FRAME_WINDOW_P (it->f))))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4063 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4064 if (/* IT->hpos == 0 means the very first glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4065 doesn't fit on the line, e.g. a wide image. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4066 it->hpos == 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4067 || (new_x == it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4068 && FRAME_WINDOW_P (it->f)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4069 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4070 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4071 it->current_x = new_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4072 if (i == it->nglyphs - 1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4073 set_iterator_to_next (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4074 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4075 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4076 it->current_x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4077
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4078 result = MOVE_LINE_CONTINUED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4079 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4080 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4081 else if (new_x > it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4082 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4083 /* Glyph is visible. Increment number of glyphs that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4084 would be displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4085 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4086 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4087 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4088 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4089 /* Glyph is completely off the left margin of the display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4090 area. Nothing to do. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4091 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4092 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4093
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4094 if (result != MOVE_UNDEFINED)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4095 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4096 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4097 else if ((op & MOVE_TO_X) && it->current_x >= to_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4098 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4099 /* Stop when TO_X specified and reached. This check is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4100 necessary here because of lines consisting of a line end,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4101 only. The line end will not produce any glyphs and we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4102 would never get MOVE_X_REACHED. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4103 xassert (it->nglyphs == 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4104 result = MOVE_X_REACHED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4105 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4106 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4107
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4108 /* Is this a line end? If yes, we're done. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4109 if (ITERATOR_AT_END_OF_LINE_P (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4110 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4111 result = MOVE_NEWLINE_OR_CR;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4112 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4113 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4114
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4115 /* The current display element has been consumed. Advance
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4116 to the next. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4117 set_iterator_to_next (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4118
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4119 /* Stop if lines are truncated and IT's current x-position is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4120 past the right edge of the window now. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4121 if (it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4122 && it->current_x >= it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4123 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4124 result = MOVE_LINE_TRUNCATED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4125 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4126 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4127 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4128
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4129 /* Restore the iterator settings altered at the beginning of this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4130 function. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4131 it->glyph_row = saved_glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4132 return result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4133 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4134
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4135
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4136 /* Move IT forward to a specified buffer position TO_CHARPOS, TO_X,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4137 TO_Y, TO_VPOS. OP is a bit-mask that specifies where to stop. See
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4138 the description of enum move_operation_enum.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4139
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4140 If TO_CHARPOS is in invisible text, e.g. a truncated part of a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4141 screen line, this function will set IT to the next position >
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4142 TO_CHARPOS. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4143
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4144 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4145 move_it_to (it, to_charpos, to_x, to_y, to_vpos, op)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4146 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4147 int to_charpos, to_x, to_y, to_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4148 int op;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4149 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4150 enum move_it_result skip, skip2 = MOVE_X_REACHED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4151 int line_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4152
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4153 while (1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4154 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4155 if (op & MOVE_TO_VPOS)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4156 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4157 /* If no TO_CHARPOS and no TO_X specified, stop at the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4158 start of the line TO_VPOS. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4159 if ((op & (MOVE_TO_X | MOVE_TO_POS)) == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4160 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4161 if (it->vpos == to_vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4162 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4163 skip = move_it_in_display_line_to (it, -1, -1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4164 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4165 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4166 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4167 /* TO_VPOS >= 0 means stop at TO_X in the line at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4168 TO_VPOS, or at TO_POS, whichever comes first. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4169 skip = move_it_in_display_line_to (it, to_charpos, to_x, op);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4170
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4171 if (skip == MOVE_POS_MATCH_OR_ZV || it->vpos == to_vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4172 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4173 else if (skip == MOVE_X_REACHED && it->vpos != to_vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4174 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4175 /* We have reached TO_X but not in the line we want. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4176 skip = move_it_in_display_line_to (it, to_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4177 -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4178 if (skip == MOVE_POS_MATCH_OR_ZV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4179 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4180 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4181 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4182 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4183 else if (op & MOVE_TO_Y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4184 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4185 struct it it_backup;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4186 int done_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4187
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4188 /* TO_Y specified means stop at TO_X in the line containing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4189 TO_Y---or at TO_CHARPOS if this is reached first. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4190 problem is that we can't really tell whether the line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4191 contains TO_Y before we have completely scanned it, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4192 this may skip past TO_X. What we do is to first scan to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4193 TO_X.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4194
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4195 If TO_X is not specified, use a TO_X of zero. The reason
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4196 is to make the outcome of this function more predictable.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4197 If we didn't use TO_X == 0, we would stop at the end of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4198 the line which is probably not what a caller would expect
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4199 to happen. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4200 skip = move_it_in_display_line_to (it, to_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4201 ((op & MOVE_TO_X)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4202 ? to_x : 0),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4203 (MOVE_TO_X
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4204 | (op & MOVE_TO_POS)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4205
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4206 /* If TO_CHARPOS is reached or ZV, we don't have to do more. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4207 if (skip == MOVE_POS_MATCH_OR_ZV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4208 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4209
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4210 /* If TO_X was reached, we would like to know whether TO_Y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4211 is in the line. This can only be said if we know the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4212 total line height which requires us to scan the rest of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4213 the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4214 done_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4215 if (skip == MOVE_X_REACHED)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4216 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4217 it_backup = *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4218 skip2 = move_it_in_display_line_to (it, to_charpos, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4219 op & MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4220 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4221
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4222 /* Now, decide whether TO_Y is in this line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4223 line_height = it->max_ascent + it->max_descent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4224
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4225 if (to_y >= it->current_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4226 && to_y < it->current_y + line_height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4227 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4228 if (skip == MOVE_X_REACHED)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4229 /* If TO_Y is in this line and TO_X was reached above,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4230 we scanned too far. We have to restore IT's settings
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4231 to the ones before skipping. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4232 *it = it_backup;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4233 done_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4234 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4235 else if (skip == MOVE_X_REACHED)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4236 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4237 skip = skip2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4238 if (skip == MOVE_POS_MATCH_OR_ZV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4239 done_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4240 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4241
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4242 if (done_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4243 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4244 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4245 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4246 skip = move_it_in_display_line_to (it, to_charpos, -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4247
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4248 switch (skip)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4249 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4250 case MOVE_POS_MATCH_OR_ZV:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4251 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4252
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4253 case MOVE_NEWLINE_OR_CR:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4254 set_iterator_to_next (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4255 it->continuation_lines_width = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4256 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4257
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4258 case MOVE_LINE_TRUNCATED:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4259 it->continuation_lines_width = 0;
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
4260 reseat_at_next_visible_line_start (it, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4261 if ((op & MOVE_TO_POS) != 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4262 && IT_CHARPOS (*it) > to_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4263 goto out;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4264 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4265
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4266 case MOVE_LINE_CONTINUED:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4267 it->continuation_lines_width += it->current_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4268 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4269
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4270 default:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4271 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4272 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4273
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4274 /* Reset/increment for the next run. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4275 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4276 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4277 it->current_y += it->max_ascent + it->max_descent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4278 ++it->vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4279 last_height = it->max_ascent + it->max_descent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4280 last_max_ascent = it->max_ascent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4281 it->max_ascent = it->max_descent = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4282 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4283 out:;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4284 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4285
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4286
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4287 /* Move iterator IT backward by a specified y-distance DY, DY >= 0.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4288
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4289 If DY > 0, move IT backward at least that many pixels. DY = 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4290 means move IT backward to the preceding line start or BEGV. This
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4291 function may move over more than DY pixels if IT->current_y - DY
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4292 ends up in the middle of a line; in this case IT->current_y will be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4293 set to the top of the line moved to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4294
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4295 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4296 move_it_vertically_backward (it, dy)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4297 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4298 int dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4299 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4300 int nlines, h, line_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4301 struct it it2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4302 int start_pos = IT_CHARPOS (*it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4303
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4304 xassert (dy >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4305
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4306 /* Estimate how many newlines we must move back. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4307 nlines = max (1, dy / CANON_Y_UNIT (it->f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4308
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4309 /* Set the iterator's position that many lines back. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4310 while (nlines-- && IT_CHARPOS (*it) > BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4311 back_to_previous_visible_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4312
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4313 /* Reseat the iterator here. When moving backward, we don't want
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4314 reseat to skip forward over invisible text, set up the iterator
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4315 to deliver from overlay strings at the new position etc. So,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4316 use reseat_1 here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4317 reseat_1 (it, it->current.pos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4318
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4319 /* We are now surely at a line start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4320 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4321
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4322 /* Move forward and see what y-distance we moved. First move to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4323 start of the next line so that we get its height. We need this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4324 height to be able to tell whether we reached the specified
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4325 y-distance. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4326 it2 = *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4327 it2.max_ascent = it2.max_descent = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4328 move_it_to (&it2, start_pos, -1, -1, it2.vpos + 1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4329 MOVE_TO_POS | MOVE_TO_VPOS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4330 xassert (IT_CHARPOS (*it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4331 line_height = it2.max_ascent + it2.max_descent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4332 move_it_to (&it2, start_pos, -1, -1, -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4333 xassert (IT_CHARPOS (*it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4334 h = it2.current_y - it->current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4335 nlines = it2.vpos - it->vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4336
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4337 /* Correct IT's y and vpos position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4338 it->vpos -= nlines;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4339 it->current_y -= h;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4340
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4341 if (dy == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4342 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4343 /* DY == 0 means move to the start of the screen line. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4344 value of nlines is > 0 if continuation lines were involved. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4345 if (nlines > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4346 move_it_by_lines (it, nlines, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4347 xassert (IT_CHARPOS (*it) <= start_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4348 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4349 else if (nlines)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4350 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4351 /* The y-position we try to reach. Note that h has been
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4352 subtracted in front of the if-statement. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4353 int target_y = it->current_y + h - dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4354
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4355 /* If we did not reach target_y, try to move further backward if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4356 we can. If we moved too far backward, try to move forward. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4357 if (target_y < it->current_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4358 && IT_CHARPOS (*it) > BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4359 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4360 move_it_vertically (it, target_y - it->current_y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4361 xassert (IT_CHARPOS (*it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4362 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4363 else if (target_y >= it->current_y + line_height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4364 && IT_CHARPOS (*it) < ZV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4365 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4366 move_it_vertically (it, target_y - (it->current_y + line_height));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4367 xassert (IT_CHARPOS (*it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4368 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4369 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4370 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4371
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4372
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4373 /* Move IT by a specified amount of pixel lines DY. DY negative means
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4374 move backwards. DY = 0 means move to start of screen line. At the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4375 end, IT will be on the start of a screen line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4376
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4377 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4378 move_it_vertically (it, dy)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4379 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4380 int dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4381 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4382 if (dy <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4383 move_it_vertically_backward (it, -dy);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4384 else if (dy > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4385 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4386 move_it_to (it, ZV, -1, it->current_y + dy, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4387 MOVE_TO_POS | MOVE_TO_Y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4388
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4389 /* If buffer ends in ZV without a newline, move to the start of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4390 the line to satisfy the post-condition. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4391 if (IT_CHARPOS (*it) == ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4392 && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4393 move_it_by_lines (it, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4394 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4395 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4396
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4397
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4398 /* Return non-zero if some text between buffer positions START_CHARPOS
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4399 and END_CHARPOS is invisible. IT->window is the window for text
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4400 property lookup. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4401
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4402 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4403 invisible_text_between_p (it, start_charpos, end_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4404 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4405 int start_charpos, end_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4406 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4407 #ifdef USE_TEXT_PROPERTIES
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4408 Lisp_Object prop, limit;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4409 int invisible_found_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4410
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4411 xassert (it != NULL && start_charpos <= end_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4412
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4413 /* Is text at START invisible? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4414 prop = Fget_char_property (make_number (start_charpos), Qinvisible,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4415 it->window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4416 if (TEXT_PROP_MEANS_INVISIBLE (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4417 invisible_found_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4418 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4419 {
25820
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
4420 limit = next_single_char_property_change (make_number (start_charpos),
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
4421 Qinvisible, Qnil,
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
4422 make_number (end_charpos));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4423 invisible_found_p = XFASTINT (limit) < end_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4424 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4425
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4426 return invisible_found_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4427
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4428 #else /* not USE_TEXT_PROPERTIES */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4429 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4430 #endif /* not USE_TEXT_PROPERTIES */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4431 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4432
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4433
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4434 /* Move IT by a specified number DVPOS of screen lines down. DVPOS
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4435 negative means move up. DVPOS == 0 means move to the start of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4436 screen line. NEED_Y_P non-zero means calculate IT->current_y. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4437 NEED_Y_P is zero, IT->current_y will be left unchanged.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4438
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4439 Further optimization ideas: If we would know that IT->f doesn't use
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4440 a face with proportional font, we could be faster for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4441 truncate-lines nil. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4442
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4443 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4444 move_it_by_lines (it, dvpos, need_y_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4445 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4446 int dvpos, need_y_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4447 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4448 struct position pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4449
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4450 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4451 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4452 struct text_pos textpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4453
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4454 /* We can use vmotion on frames without proportional fonts. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4455 pos = *vmotion (IT_CHARPOS (*it), dvpos, it->w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4456 SET_TEXT_POS (textpos, pos.bufpos, pos.bytepos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4457 reseat (it, textpos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4458 it->vpos += pos.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4459 it->current_y += pos.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4460 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4461 else if (dvpos == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4462 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4463 /* DVPOS == 0 means move to the start of the screen line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4464 move_it_vertically_backward (it, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4465 xassert (it->current_x == 0 && it->hpos == 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4466 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4467 else if (dvpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4468 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4469 /* If there are no continuation lines, and if there is no
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4470 selective display, try the simple method of moving forward
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4471 DVPOS newlines, then see where we are. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4472 if (!need_y_p && it->truncate_lines_p && it->selective == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4473 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4474 int shortage = 0, charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4475
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4476 if (FETCH_BYTE (IT_BYTEPOS (*it) == '\n'))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4477 charpos = IT_CHARPOS (*it) + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4478 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4479 charpos = scan_buffer ('\n', IT_CHARPOS (*it), 0, dvpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4480 &shortage, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4481
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4482 if (!invisible_text_between_p (it, IT_CHARPOS (*it), charpos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4483 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4484 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4485 CHARPOS (pos) = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4486 BYTEPOS (pos) = CHAR_TO_BYTE (charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4487 reseat (it, pos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4488 it->vpos += dvpos - shortage;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4489 it->hpos = it->current_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4490 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4491 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4492 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4493
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4494 move_it_to (it, -1, -1, -1, it->vpos + dvpos, MOVE_TO_VPOS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4495 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4496 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4497 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4498 struct it it2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4499 int start_charpos, i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4500
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4501 /* If there are no continuation lines, and if there is no
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4502 selective display, try the simple method of moving backward
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4503 -DVPOS newlines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4504 if (!need_y_p && it->truncate_lines_p && it->selective == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4505 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4506 int shortage;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4507 int charpos = IT_CHARPOS (*it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4508 int bytepos = IT_BYTEPOS (*it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4509
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4510 /* If in the middle of a line, go to its start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4511 if (charpos > BEGV && FETCH_BYTE (bytepos - 1) != '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4512 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4513 charpos = find_next_newline_no_quit (charpos, -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4514 bytepos = CHAR_TO_BYTE (charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4515 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4516
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4517 if (charpos == BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4518 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4519 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4520 CHARPOS (pos) = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4521 BYTEPOS (pos) = bytepos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4522 reseat (it, pos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4523 it->hpos = it->current_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4524 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4525 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4526 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4527 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4528 charpos = scan_buffer ('\n', charpos - 1, 0, dvpos, &shortage, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4529 if (!invisible_text_between_p (it, charpos, IT_CHARPOS (*it)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4530 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4531 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4532 CHARPOS (pos) = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4533 BYTEPOS (pos) = CHAR_TO_BYTE (charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4534 reseat (it, pos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4535 it->vpos += dvpos + (shortage ? shortage - 1 : 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4536 it->hpos = it->current_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4537 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4538 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4539 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4540 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4541
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4542 /* Go back -DVPOS visible lines and reseat the iterator there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4543 start_charpos = IT_CHARPOS (*it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4544 for (i = -dvpos; i && IT_CHARPOS (*it) > BEGV; --i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4545 back_to_previous_visible_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4546 reseat (it, it->current.pos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4547 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4548
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4549 /* Above call may have moved too far if continuation lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4550 are involved. Scan forward and see if it did. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4551 it2 = *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4552 it2.vpos = it2.current_y = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4553 move_it_to (&it2, start_charpos, -1, -1, -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4554 it->vpos -= it2.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4555 it->current_y -= it2.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4556 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4557
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4558 /* If we moved too far, move IT some lines forward. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4559 if (it2.vpos > -dvpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4560 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4561 int delta = it2.vpos + dvpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4562 move_it_to (it, -1, -1, -1, it->vpos + delta, MOVE_TO_VPOS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4563 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4564 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4565 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4566
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4567
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4568
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4569 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4570 Messages
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4571 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4572
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4573
25798
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4574 /* Add a message with format string FORMAT and arguments ARG1 and ARG2
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4575 to *Messages*. */
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4576
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4577 void
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4578 add_to_log (format, arg1, arg2)
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4579 char *format;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4580 Lisp_Object arg1, arg2;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4581 {
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4582 Lisp_Object args[3];
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4583 Lisp_Object msg, fmt;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4584 char *buffer;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4585 int len;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4586 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4587
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4588 fmt = msg = Qnil;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4589 GCPRO4 (fmt, msg, arg1, arg2);
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4590
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4591 args[0] = fmt = build_string (format);
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4592 args[1] = arg1;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4593 args[2] = arg2;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4594 msg = Fformat (make_number (3), args);
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4595
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4596 len = STRING_BYTES (XSTRING (msg)) + 1;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4597 buffer = (char *) alloca (len);
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4598 strcpy (buffer, XSTRING (msg)->data);
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4599
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4600 message_dolog (buffer, len, 1, 0);
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4601 UNGCPRO;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4602 }
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4603
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
4604
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
4605 /* Output a newline in the *Messages* buffer if "needs" one. */
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
4606
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
4607 void
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
4608 message_log_maybe_newline ()
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
4609 {
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
4610 if (message_log_need_newline)
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4611 message_dolog ("", 0, 1, 0);
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
4612 }
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
4613
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
4614
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4615 /* Add a string M of length LEN to the message log, optionally
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4616 terminated with a newline when NLFLAG is non-zero. MULTIBYTE, if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4617 nonzero, means interpret the contents of M as multibyte. This
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4618 function calls low-level routines in order to bypass text property
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4619 hooks, etc. which might not be safe to run. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4620
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4621 void
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4622 message_dolog (m, len, nlflag, multibyte)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4623 char *m;
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4624 int len, nlflag, multibyte;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4625 {
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
4626 if (!NILP (Vmessage_log_max))
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4627 {
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4628 struct buffer *oldbuf;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4629 Lisp_Object oldpoint, oldbegv, oldzv;
13733
e51b69e60614 (message_dolog): Save and restore windows_or_buffers_changed.
Richard M. Stallman <rms@gnu.org>
parents: 13655
diff changeset
4630 int old_windows_or_buffers_changed = windows_or_buffers_changed;
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4631 int point_at_end = 0;
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4632 int zv_at_end = 0;
22209
571020b7fc5e (message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents: 22148
diff changeset
4633 Lisp_Object old_deactivate_mark, tem;
22500
274456e421ab (message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents: 22399
diff changeset
4634 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
21179
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
4635
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
4636 old_deactivate_mark = Vdeactivate_mark;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4637 oldbuf = current_buffer;
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
4638 Fset_buffer (Fget_buffer_create (build_string ("*Messages*")));
11531
355c40d2b1d2 (message_dolog): The message log doesn't need an undo list.
Karl Heuer <kwzh@gnu.org>
parents: 11499
diff changeset
4639 current_buffer->undo_list = Qt;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4640
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4641 oldpoint = Fpoint_marker ();
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4642 oldbegv = Fpoint_min_marker ();
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4643 oldzv = Fpoint_max_marker ();
22500
274456e421ab (message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents: 22399
diff changeset
4644 GCPRO4 (oldpoint, oldbegv, oldzv, old_deactivate_mark);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4645
20703
f465da76f36b (message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 20689
diff changeset
4646 if (PT == Z)
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4647 point_at_end = 1;
20703
f465da76f36b (message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 20689
diff changeset
4648 if (ZV == Z)
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4649 zv_at_end = 1;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4650
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4651 BEGV = BEG;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4652 BEGV_BYTE = BEG_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4653 ZV = Z;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4654 ZV_BYTE = Z_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4655 TEMP_SET_PT_BOTH (Z, Z_BYTE);
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4656
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4657 /* Insert the string--maybe converting multibyte to single byte
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4658 or vice versa, so that all the text fits the buffer. */
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4659 if (multibyte
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4660 && NILP (current_buffer->enable_multibyte_characters))
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4661 {
24040
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4662 int i, c, nbytes;
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4663 unsigned char work[1];
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4664
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4665 /* Convert a multibyte string to single-byte
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4666 for the *Message* buffer. */
24040
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4667 for (i = 0; i < len; i += nbytes)
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4668 {
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
4669 c = string_char_and_length (m + i, len - i, &nbytes);
24040
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4670 work[0] = (SINGLE_BYTE_CHAR_P (c)
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4671 ? c
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4672 : multibyte_char_to_unibyte (c, Qnil));
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4673 insert_1_both (work, 1, 1, 1, 0, 0);
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4674 }
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4675 }
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4676 else if (! multibyte
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4677 && ! NILP (current_buffer->enable_multibyte_characters))
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4678 {
24040
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4679 int i, c, nbytes;
20786
49d68bf8f34b (message_dolog): Cast M to unsigned char * to access bytes.
Richard M. Stallman <rms@gnu.org>
parents: 20703
diff changeset
4680 unsigned char *msg = (unsigned char *) m;
24040
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4681 unsigned char *str, work[4];
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4682 /* Convert a single-byte string to multibyte
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4683 for the *Message* buffer. */
24040
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4684 for (i = 0; i < len; i++)
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4685 {
24040
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4686 c = unibyte_char_to_multibyte (msg[i]);
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4687 nbytes = CHAR_STRING (c, work, str);
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4688 insert_1_both (work, 1, nbytes, 1, 0, 0);
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4689 }
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4690 }
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4691 else if (len)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4692 insert_1 (m, len, 1, 0, 0);
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4693
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
4694 if (nlflag)
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4695 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4696 int this_bol, this_bol_byte, prev_bol, prev_bol_byte, dup;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4697 insert_1 ("\n", 1, 1, 0, 0);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4698
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4699 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE, -2, 0);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4700 this_bol = PT;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4701 this_bol_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4702
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4703 if (this_bol > BEG)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4704 {
20703
f465da76f36b (message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 20689
diff changeset
4705 scan_newline (PT, PT_BYTE, BEG, BEG_BYTE, -2, 0);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4706 prev_bol = PT;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4707 prev_bol_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4708
20964
4cad33afd914 (message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents: 20926
diff changeset
4709 dup = message_log_check_duplicate (prev_bol, prev_bol_byte,
4cad33afd914 (message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents: 20926
diff changeset
4710 this_bol, this_bol_byte);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4711 if (dup)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4712 {
20981
0ce30e7ba2b8 Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents: 20964
diff changeset
4713 del_range_both (prev_bol, prev_bol_byte,
0ce30e7ba2b8 Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents: 20964
diff changeset
4714 this_bol, this_bol_byte, 0);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4715 if (dup > 1)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4716 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4717 char dupstr[40];
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4718 int duplen;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4719
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4720 /* If you change this format, don't forget to also
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4721 change message_log_check_duplicate. */
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4722 sprintf (dupstr, " [%d times]", dup);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4723 duplen = strlen (dupstr);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4724 TEMP_SET_PT_BOTH (Z - 1, Z_BYTE - 1);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4725 insert_1 (dupstr, duplen, 1, 0, 1);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4726 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4727 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4728 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4729
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4730 if (NATNUMP (Vmessage_log_max))
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4731 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4732 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4733 -XFASTINT (Vmessage_log_max) - 1, 0);
20981
0ce30e7ba2b8 Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents: 20964
diff changeset
4734 del_range_both (BEG, BEG_BYTE, PT, PT_BYTE, 0);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4735 }
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4736 }
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4737 BEGV = XMARKER (oldbegv)->charpos;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4738 BEGV_BYTE = marker_byte_position (oldbegv);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4739
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4740 if (zv_at_end)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4741 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4742 ZV = Z;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4743 ZV_BYTE = Z_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4744 }
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4745 else
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4746 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4747 ZV = XMARKER (oldzv)->charpos;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4748 ZV_BYTE = marker_byte_position (oldzv);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4749 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4750
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4751 if (point_at_end)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4752 TEMP_SET_PT_BOTH (Z, Z_BYTE);
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
4753 else
24040
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4754 /* We can't do Fgoto_char (oldpoint) because it will run some
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4755 Lisp code. */
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4756 TEMP_SET_PT_BOTH (XMARKER (oldpoint)->charpos,
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
4757 XMARKER (oldpoint)->bytepos);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4758
22500
274456e421ab (message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents: 22399
diff changeset
4759 UNGCPRO;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4760 free_marker (oldpoint);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4761 free_marker (oldbegv);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4762 free_marker (oldzv);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4763
22209
571020b7fc5e (message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents: 22148
diff changeset
4764 tem = Fget_buffer_window (Fcurrent_buffer (), Qt);
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4765 set_buffer_internal (oldbuf);
22209
571020b7fc5e (message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents: 22148
diff changeset
4766 if (NILP (tem))
571020b7fc5e (message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents: 22148
diff changeset
4767 windows_or_buffers_changed = old_windows_or_buffers_changed;
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
4768 message_log_need_newline = !nlflag;
21179
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
4769 Vdeactivate_mark = old_deactivate_mark;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4770 }
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
4771 }
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
4772
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4773
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4774 /* We are at the end of the buffer after just having inserted a newline.
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4775 (Note: We depend on the fact we won't be crossing the gap.)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4776 Check to see if the most recent message looks a lot like the previous one.
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4777 Return 0 if different, 1 if the new one should just replace it, or a
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4778 value N > 1 if we should also append " [N times]". */
11444
763c454b044e (redisplay): Call init_desired_glyphs for each frame.
Richard M. Stallman <rms@gnu.org>
parents: 11354
diff changeset
4779
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4780 static int
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4781 message_log_check_duplicate (prev_bol, prev_bol_byte, this_bol, this_bol_byte)
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4782 int prev_bol, this_bol;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4783 int prev_bol_byte, this_bol_byte;
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4784 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4785 int i;
23257
b72cefab3254 (message_log_check_duplicate): Count byte length of the
Kenichi Handa <handa@m17n.org>
parents: 23249
diff changeset
4786 int len = Z_BYTE - 1 - this_bol_byte;
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4787 int seen_dots = 0;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4788 unsigned char *p1 = BUF_BYTE_ADDRESS (current_buffer, prev_bol_byte);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
4789 unsigned char *p2 = BUF_BYTE_ADDRESS (current_buffer, this_bol_byte);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4790
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4791 for (i = 0; i < len; i++)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4792 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4793 if (i >= 3 && p1[i-3] == '.' && p1[i-2] == '.' && p1[i-1] == '.'
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4794 && p1[i] != '\n')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4795 seen_dots = 1;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4796 if (p1[i] != p2[i])
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4797 return seen_dots;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4798 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4799 p1 += len;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4800 if (*p1 == '\n')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4801 return 2;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4802 if (*p1++ == ' ' && *p1++ == '[')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4803 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4804 int n = 0;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4805 while (*p1 >= '0' && *p1 <= '9')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4806 n = n * 10 + *p1++ - '0';
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4807 if (strncmp (p1, " times]\n", 8) == 0)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4808 return n+1;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4809 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4810 return 0;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
4811 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4812
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4813
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4814 /* Display an echo area message M with a specified length of LEN
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4815 chars. The string may include null characters. If M is 0, clear
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4816 out any existing message, and let the mini-buffer text show through.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4817
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4818 The buffer M must continue to exist until after the echo area gets
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4819 cleared or some other message gets displayed there. This means do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4820 not pass text that is stored in a Lisp string; do not pass text in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4821 a buffer that was alloca'd. */
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
4822
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
4823 void
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4824 message2 (m, len, multibyte)
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
4825 char *m;
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
4826 int len;
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4827 int multibyte;
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
4828 {
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
4829 /* First flush out any partial line written with print. */
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
4830 message_log_maybe_newline ();
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
4831 if (m)
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4832 message_dolog (m, len, 1, multibyte);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4833 message2_nolog (m, len, multibyte);
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4834 }
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4835
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4836
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
4837 /* The non-logging counterpart of message2. */
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4838
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4839 void
20494
9946c5fb4ff7 (message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20473
diff changeset
4840 message2_nolog (m, len, multibyte)
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4841 char *m;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4842 int len;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
4843 {
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
4844 struct frame *sf = SELECTED_FRAME ();
20494
9946c5fb4ff7 (message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20473
diff changeset
4845 message_enable_multibyte = multibyte;
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
4846
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4847 if (noninteractive)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4848 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4849 if (noninteractive_need_newline)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4850 putc ('\n', stderr);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4851 noninteractive_need_newline = 0;
18752
8fce2f503ea9 (message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents: 18730
diff changeset
4852 if (m)
8fce2f503ea9 (message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents: 18730
diff changeset
4853 fwrite (m, len, 1, stderr);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4854 if (cursor_in_echo_area == 0)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4855 fprintf (stderr, "\n");
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4856 fflush (stderr);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4857 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4858 /* 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
4859 initialized yet. Error messages get reported properly by
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4860 cmd_error, so this must be just an informative message; toss it. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4861 else if (INTERACTIVE
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
4862 && sf->glyphs_initialized_p
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
4863 && FRAME_MESSAGE_BUF (sf))
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4864 {
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
4865 Lisp_Object mini_window;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4866 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4867
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4868 /* Get the frame containing the mini-buffer
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
4869 that the selected frame is using. */
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
4870 mini_window = FRAME_MINIBUF_WINDOW (sf);
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
4871 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
4872
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
4873 FRAME_SAMPLE_VISIBILITY (f);
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
4874 if (FRAME_VISIBLE_P (sf)
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
4875 && ! FRAME_VISIBLE_P (f))
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
4876 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (mini_window)));
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4877
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4878 if (m)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4879 {
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4880 set_message (m, Qnil, len, multibyte);
16660
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
4881 if (minibuffer_auto_raise)
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
4882 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window)));
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
4883 }
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
4884 else
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4885 clear_message (1, 1);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4886
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4887 do_pending_window_change (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4888 echo_area_display (1);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4889 do_pending_window_change (0);
6661
a26e7181f36b (display_text_line): Properly handle charstarts for hscroll,
Richard M. Stallman <rms@gnu.org>
parents: 6650
diff changeset
4890 if (frame_up_to_date_hook != 0 && ! gc_in_progress)
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
4891 (*frame_up_to_date_hook) (f);
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
4892 }
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
4893 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4894
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4895
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4896 /* Display an echo area message M with a specified length of NBYTES
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4897 bytes. The string may include null characters. If M is not a
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4898 string, clear out any existing message, and let the mini-buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4899 text show through. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4900
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4901 void
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4902 message3 (m, nbytes, multibyte)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4903 Lisp_Object m;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4904 int nbytes;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4905 int multibyte;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4906 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4907 struct gcpro gcpro1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4908
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4909 GCPRO1 (m);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4910
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4911 /* First flush out any partial line written with print. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4912 message_log_maybe_newline ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4913 if (STRINGP (m))
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4914 message_dolog (XSTRING (m)->data, nbytes, 1, multibyte);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4915 message3_nolog (m, nbytes, multibyte);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4916
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4917 UNGCPRO;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4918 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4919
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4920
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4921 /* The non-logging version of message3. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4922
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4923 void
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4924 message3_nolog (m, nbytes, multibyte)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4925 Lisp_Object m;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4926 int nbytes, multibyte;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4927 {
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
4928 struct frame *sf = SELECTED_FRAME ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4929 message_enable_multibyte = multibyte;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4930
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4931 if (noninteractive)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4932 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4933 if (noninteractive_need_newline)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4934 putc ('\n', stderr);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4935 noninteractive_need_newline = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4936 if (STRINGP (m))
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4937 fwrite (XSTRING (m)->data, nbytes, 1, stderr);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4938 if (cursor_in_echo_area == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4939 fprintf (stderr, "\n");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4940 fflush (stderr);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4941 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4942 /* A null message buffer means that the frame hasn't really been
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4943 initialized yet. Error messages get reported properly by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4944 cmd_error, so this must be just an informative message; toss it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4945 else if (INTERACTIVE
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
4946 && sf->glyphs_initialized_p
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
4947 && FRAME_MESSAGE_BUF (sf))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4948 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4949 Lisp_Object mini_window;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4950 Lisp_Object frame;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4951 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4952
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4953 /* Get the frame containing the mini-buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4954 that the selected frame is using. */
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
4955 mini_window = FRAME_MINIBUF_WINDOW (sf);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4956 frame = XWINDOW (mini_window)->frame;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4957 f = XFRAME (frame);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4958
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4959 FRAME_SAMPLE_VISIBILITY (f);
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
4960 if (FRAME_VISIBLE_P (sf)
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4961 && !FRAME_VISIBLE_P (f))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4962 Fmake_frame_visible (frame);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4963
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4964 if (STRINGP (m) && XSTRING (m)->size)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4965 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4966 set_message (NULL, m, nbytes, multibyte);
25393
9aff86718a20 (try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents: 25388
diff changeset
4967 if (minibuffer_auto_raise)
9aff86718a20 (try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents: 25388
diff changeset
4968 Fraise_frame (frame);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4969 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4970 else
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4971 clear_message (1, 1);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4972
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4973 do_pending_window_change (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4974 echo_area_display (1);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
4975 do_pending_window_change (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4976 if (frame_up_to_date_hook != 0 && ! gc_in_progress)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4977 (*frame_up_to_date_hook) (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4978 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4979 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4980
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4981
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4982 /* Display a null-terminated echo area message M. If M is 0, clear
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4983 out any existing message, and let the mini-buffer text show through.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4984
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4985 The buffer M must continue to exist until after the echo area gets
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4986 cleared or some other message gets displayed there. Do not pass
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4987 text that is stored in a Lisp string. Do not pass text in a buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4988 that was alloca'd. */
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
4989
6366
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
4990 void
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
4991 message1 (m)
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
4992 char *m;
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
4993 {
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
4994 message2 (m, (m ? strlen (m) : 0), 0);
6366
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
4995 }
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
4996
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4997
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4998 /* The non-logging counterpart of message1. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4999
10394
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5000 void
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5001 message1_nolog (m)
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5002 char *m;
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5003 {
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5004 message2_nolog (m, (m ? strlen (m) : 0), 0);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5005 }
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5006
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5007 /* Display a message M which contains a single %s
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5008 which gets replaced with STRING. */
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5009
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5010 void
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5011 message_with_string (m, string, log)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5012 char *m;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5013 Lisp_Object string;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5014 int log;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5015 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5016 if (noninteractive)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5017 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5018 if (m)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5019 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5020 if (noninteractive_need_newline)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5021 putc ('\n', stderr);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5022 noninteractive_need_newline = 0;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5023 fprintf (stderr, m, XSTRING (string)->data);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5024 if (cursor_in_echo_area == 0)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5025 fprintf (stderr, "\n");
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5026 fflush (stderr);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5027 }
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5028 }
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5029 else if (INTERACTIVE)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5030 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5031 /* The frame whose minibuffer we're going to display the message on.
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5032 It may be larger than the selected frame, so we need
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5033 to use its buffer, not the selected frame's buffer. */
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5034 Lisp_Object mini_window;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5035 struct frame *f, *sf = SELECTED_FRAME ();
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5036
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5037 /* Get the frame containing the minibuffer
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5038 that the selected frame is using. */
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5039 mini_window = FRAME_MINIBUF_WINDOW (sf);
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5040 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5041
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5042 /* A null message buffer means that the frame hasn't really been
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5043 initialized yet. Error messages get reported properly by
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5044 cmd_error, so this must be just an informative message; toss it. */
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5045 if (FRAME_MESSAGE_BUF (f))
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5046 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5047 int len;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5048 char *a[1];
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5049 a[0] = (char *) XSTRING (string)->data;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5050
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5051 len = doprnt (FRAME_MESSAGE_BUF (f),
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5052 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, a);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5053
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5054 if (log)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5055 message2 (FRAME_MESSAGE_BUF (f), len,
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5056 STRING_MULTIBYTE (string));
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5057 else
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5058 message2_nolog (FRAME_MESSAGE_BUF (f), len,
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5059 STRING_MULTIBYTE (string));
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5060
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5061 /* Print should start at the beginning of the message
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5062 buffer next time. */
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5063 message_buf_print = 0;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5064 }
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5065 }
10394
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5066 }
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5067
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5068
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
5069 /* Dump an informative message to the minibuf. If M is 0, clear out
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5070 any existing message, and let the mini-buffer text show through. */
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
5071
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5072 /* VARARGS 1 */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5073 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5074 message (m, a1, a2, a3)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5075 char *m;
8834
ba6936b88869 (message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents: 8797
diff changeset
5076 EMACS_INT a1, a2, a3;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5077 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5078 if (noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5079 {
1446
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
5080 if (m)
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
5081 {
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
5082 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
5083 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
5084 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
5085 fprintf (stderr, m, a1, a2, a3);
2526
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
5086 if (cursor_in_echo_area == 0)
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
5087 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
5088 fflush (stderr);
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
5089 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5090 }
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5091 else if (INTERACTIVE)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5092 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5093 /* The frame whose mini-buffer we're going to display the message
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5094 on. It may be larger than the selected frame, so we need to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5095 use its buffer, not the selected frame's buffer. */
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5096 Lisp_Object mini_window;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5097 struct frame *f, *sf = SELECTED_FRAME ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5098
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5099 /* Get the frame containing the mini-buffer
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5100 that the selected frame is using. */
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5101 mini_window = FRAME_MINIBUF_WINDOW (sf);
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5102 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5103
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5104 /* 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
5105 initialized yet. Error messages get reported properly by
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5106 cmd_error, so this must be just an informative message; toss
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5107 it. */
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5108 if (FRAME_MESSAGE_BUF (f))
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5109 {
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5110 if (m)
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5111 {
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5112 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
5113 #ifdef NO_ARG_ARRAY
20376
67f1753dc577 (message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents: 20363
diff changeset
5114 char *a[3];
67f1753dc577 (message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents: 20363
diff changeset
5115 a[0] = (char *) a1;
67f1753dc577 (message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents: 20363
diff changeset
5116 a[1] = (char *) a2;
67f1753dc577 (message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents: 20363
diff changeset
5117 a[2] = (char *) a3;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5118
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5119 len = doprnt (FRAME_MESSAGE_BUF (f),
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5120 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3, a);
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5121 #else
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5122 len = doprnt (FRAME_MESSAGE_BUF (f),
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5123 FRAME_MESSAGE_BUF_SIZE (f), m, (char *)0, 3,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5124 (char **) &a1);
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5125 #endif /* NO_ARG_ARRAY */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5126
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5127 message2 (FRAME_MESSAGE_BUF (f), len, 0);
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5128 }
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5129 else
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5130 message1 (0);
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5131
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5132 /* 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
5133 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
5134 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
5135 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5136 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5137 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5138
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5139
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
5140 /* The non-logging version of message. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5141
11193
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5142 void
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5143 message_nolog (m, a1, a2, a3)
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5144 char *m;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5145 EMACS_INT a1, a2, a3;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5146 {
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5147 Lisp_Object old_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5148 old_log_max = Vmessage_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5149 Vmessage_log_max = Qnil;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5150 message (m, a1, a2, a3);
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5151 Vmessage_log_max = old_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5152 }
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5153
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5154
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5155 /* Display the current message in the current mini-buffer. This is
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5156 only called from error handlers in process.c, and is not time
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5157 critical. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5158
9088
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
5159 void
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
5160 update_echo_area ()
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
5161 {
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5162 if (!NILP (echo_area_buffer[0]))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5163 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5164 Lisp_Object string;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5165 string = Fcurrent_message ();
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5166 message3 (string, XSTRING (string)->size,
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5167 !NILP (current_buffer->enable_multibyte_characters));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5168 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5169 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5170
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5171
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5172 /* Call FN with args A1..A5 with either the current or last displayed
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5173 echo_area_buffer as current buffer.
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5174
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5175 WHICH zero means use the current message buffer
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5176 echo_area_buffer[0]. If that is nil, choose a suitable buffer
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5177 from echo_buffer[] and clear it.
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5178
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5179 WHICH > 0 means use echo_area_buffer[1]. If that is nil, choose a
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5180 suitable buffer from echo_buffer[] and clear it.
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5181
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5182 If WHICH < 0, set echo_area_buffer[1] to echo_area_buffer[0], so
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5183 that the current message becomes the last displayed one, make
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5184 choose a suitable buffer for echo_area_buffer[0], and clear it.
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5185
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5186 Value is what FN returns. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5187
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5188 static int
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5189 with_echo_area_buffer (w, which, fn, a1, a2, a3, a4, a5)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5190 struct window *w;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5191 int which;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5192 int (*fn) ();
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5193 int a1, a2, a3, a4, a5;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5194 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5195 Lisp_Object buffer;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5196 int i, this_one, the_other, clear_buffer_p, rc;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5197 int count = specpdl_ptr - specpdl;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5198
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5199 /* If buffers aren't life, make new ones. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5200 for (i = 0; i < 2; ++i)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5201 if (!BUFFERP (echo_buffer[i])
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5202 || NILP (XBUFFER (echo_buffer[i])->name))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5203 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5204 char name[30];
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5205 sprintf (name, " *Echo Area %d*", i);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5206 echo_buffer[i] = Fget_buffer_create (build_string (name));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5207 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5208
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5209 clear_buffer_p = 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5210
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5211 if (which == 0)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5212 this_one = 0, the_other = 1;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5213 else if (which > 0)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5214 this_one = 1, the_other = 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5215 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5216 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5217 this_one = 0, the_other = 1;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5218 clear_buffer_p = 1;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5219
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5220 /* We need a fresh one in case the current echo buffer equals
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5221 the one containing the last displayed echo area message. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5222 if (!NILP (echo_area_buffer[this_one])
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5223 && EQ (echo_area_buffer[this_one], echo_area_buffer[the_other]))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5224 echo_area_buffer[this_one] = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5225 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5226
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5227 /* Choose a suitable buffer from echo_buffer[] is we don't
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5228 have one. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5229 if (NILP (echo_area_buffer[this_one]))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5230 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5231 echo_area_buffer[this_one]
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5232 = (EQ (echo_area_buffer[the_other], echo_buffer[this_one])
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5233 ? echo_buffer[the_other]
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5234 : echo_buffer[this_one]);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5235 clear_buffer_p = 1;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5236 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5237
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5238 buffer = echo_area_buffer[this_one];
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5239
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5240 record_unwind_protect (unwind_with_echo_area_buffer,
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5241 with_echo_area_buffer_unwind_data (w));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5242
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5243 /* Make the echo area buffer current. Note that for display
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5244 purposes, it is not necessary that the displayed window's buffer
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5245 == current_buffer, except for text property lookup. So, let's
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5246 only set that buffer temporarily here without doing a full
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5247 Fset_window_buffer. We must also change w->pointm, though,
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5248 because otherwise an assertions in unshow_buffer fails, and Emacs
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5249 aborts. */
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
5250 set_buffer_internal_1 (XBUFFER (buffer));
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5251 if (w)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5252 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5253 w->buffer = buffer;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5254 set_marker_both (w->pointm, buffer, BEG, BEG_BYTE);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5255 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5256 current_buffer->truncate_lines = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5257 current_buffer->undo_list = Qt;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5258 current_buffer->read_only = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5259
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5260 if (clear_buffer_p && Z > BEG)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5261 del_range (BEG, Z);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5262
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5263 xassert (BEGV >= BEG);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5264 xassert (ZV <= Z && ZV >= BEGV);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5265
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5266 rc = fn (a1, a2, a3, a4, a5);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5267
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5268 xassert (BEGV >= BEG);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5269 xassert (ZV <= Z && ZV >= BEGV);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5270
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5271 unbind_to (count, Qnil);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5272 return rc;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5273 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5274
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5275
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5276 /* Save state that should be preserved around the call to the function
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5277 FN called in with_echo_area_buffer. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5278
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5279 static Lisp_Object
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5280 with_echo_area_buffer_unwind_data (w)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5281 struct window *w;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5282 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5283 int i = 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5284 Lisp_Object vector;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5285
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5286 /* Reduce consing by keeping one vector in
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5287 Vwith_echo_area_save_vector. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5288 vector = Vwith_echo_area_save_vector;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5289 Vwith_echo_area_save_vector = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5290
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5291 if (NILP (vector))
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
5292 vector = Fmake_vector (make_number (7), Qnil);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5293
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5294 XSETBUFFER (XVECTOR (vector)->contents[i], current_buffer); ++i;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5295 XVECTOR (vector)->contents[i++] = Vdeactivate_mark;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5296 XVECTOR (vector)->contents[i++] = make_number (windows_or_buffers_changed);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5297
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5298 if (w)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5299 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5300 XSETWINDOW (XVECTOR (vector)->contents[i], w); ++i;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5301 XVECTOR (vector)->contents[i++] = w->buffer;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5302 XVECTOR (vector)->contents[i++]
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5303 = make_number (XMARKER (w->pointm)->charpos);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5304 XVECTOR (vector)->contents[i++]
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5305 = make_number (XMARKER (w->pointm)->bytepos);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5306 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5307 else
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5308 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5309 int end = i + 4;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5310 while (i < end)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5311 XVECTOR (vector)->contents[i++] = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5312 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5313
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5314 xassert (i == XVECTOR (vector)->size);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5315 return vector;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5316 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5317
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5318
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5319 /* Restore global state from VECTOR which was created by
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5320 with_echo_area_buffer_unwind_data. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5321
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5322 static Lisp_Object
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5323 unwind_with_echo_area_buffer (vector)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5324 Lisp_Object vector;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5325 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5326 int i = 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5327
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
5328 set_buffer_internal_1 (XBUFFER (XVECTOR (vector)->contents[i])); ++i;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5329 Vdeactivate_mark = XVECTOR (vector)->contents[i]; ++i;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5330 windows_or_buffers_changed = XFASTINT (XVECTOR (vector)->contents[i]); ++i;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5331
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5332 if (WINDOWP (XVECTOR (vector)->contents[i]))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5333 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5334 struct window *w;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5335 Lisp_Object buffer, charpos, bytepos;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5336
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5337 w = XWINDOW (XVECTOR (vector)->contents[i]); ++i;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5338 buffer = XVECTOR (vector)->contents[i]; ++i;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5339 charpos = XVECTOR (vector)->contents[i]; ++i;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5340 bytepos = XVECTOR (vector)->contents[i]; ++i;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5341
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5342 w->buffer = buffer;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5343 set_marker_both (w->pointm, buffer,
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5344 XFASTINT (charpos), XFASTINT (bytepos));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5345 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5346
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5347 Vwith_echo_area_save_vector = vector;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5348 return Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5349 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5350
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5351
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5352 /* Set up the echo area for use by print functions. MULTIBYTE_P
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5353 non-zero means we will print multibyte. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5354
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5355 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5356 setup_echo_area_for_printing (multibyte_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5357 int multibyte_p;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5358 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5359 if (!message_buf_print)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5360 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5361 /* A message has been output since the last time we printed.
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5362 Choose a fresh echo area buffer. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5363 if (EQ (echo_area_buffer[1], echo_buffer[0]))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5364 echo_area_buffer[0] = echo_buffer[1];
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5365 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5366 echo_area_buffer[0] = echo_buffer[0];
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5367
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5368 /* Switch to that buffer and clear it. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5369 set_buffer_internal (XBUFFER (echo_area_buffer[0]));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5370 if (Z > BEG)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5371 del_range (BEG, Z);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5372 TEMP_SET_PT_BOTH (BEG, BEG_BYTE);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5373
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5374 /* Set up the buffer for the multibyteness we need. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5375 if (multibyte_p
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5376 != !NILP (current_buffer->enable_multibyte_characters))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5377 Fset_buffer_multibyte (multibyte_p ? Qt : Qnil);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5378
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5379 /* Raise the frame containing the echo area. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5380 if (minibuffer_auto_raise)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5381 {
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5382 struct frame *sf = SELECTED_FRAME ();
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5383 Lisp_Object mini_window;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5384 mini_window = FRAME_MINIBUF_WINDOW (sf);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5385 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window)));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5386 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5387
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5388 message_buf_print = 1;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5389 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5390 else if (current_buffer != XBUFFER (echo_area_buffer[0]))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5391 /* Someone switched buffers between print requests. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5392 set_buffer_internal (XBUFFER (echo_area_buffer[0]));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5393 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5394
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5395
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5396 /* Display an echo area message in window W. Value is non-zero if W's
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5397 height is changed. If display_last_displayed_message_p is
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5398 non-zero, display the message that was last displayed, otherwise
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5399 display the current message. */
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5400
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5401 static int
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5402 display_echo_area (w)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5403 struct window *w;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5404 {
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5405 int i, no_message_p, window_height_changed_p;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5406
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5407 /* If there is no message, we must call display_echo_area_1
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5408 nevertheless because it resizes the window. But we will have to
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5409 reset the echo_area_buffer in question to nil at the end because
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5410 with_echo_area_buffer will sets it to an empty buffer. */
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5411 i = display_last_displayed_message_p ? 1 : 0;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5412 no_message_p = NILP (echo_area_buffer[i]);
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5413
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5414 window_height_changed_p
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5415 = with_echo_area_buffer (w, display_last_displayed_message_p,
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5416 (int (*) ()) display_echo_area_1, w);
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5417
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5418 if (no_message_p)
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5419 echo_area_buffer[i] = Qnil;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5420
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5421 return window_height_changed_p;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5422 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5423
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5424
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5425 /* Helper for display_echo_area. Display the current buffer which
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5426 contains the current echo area message in window W, a mini-window.
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5427 Change the height of W so that all of the message is displayed.
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5428 Value is non-zero if height of W was changed. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5429
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5430 static int
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5431 display_echo_area_1 (w)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5432 struct window *w;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5433 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5434 Lisp_Object window;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5435 struct text_pos start;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5436 int window_height_changed_p = 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5437
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5438 /* Do this before displaying, so that we have a large enough glyph
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5439 matrix for the display. */
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5440 window_height_changed_p = resize_mini_window (w, 0);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5441
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5442 /* Display. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5443 clear_glyph_matrix (w->desired_matrix);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5444 XSETWINDOW (window, w);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5445 SET_TEXT_POS (start, BEG, BEG_BYTE);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5446 try_window (window, start);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5447
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5448 return window_height_changed_p;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5449 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5450
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5451
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5452 /* Resize the echo area window to exactly the size needed for the
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5453 currently displayed message, if there is one. */
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5454
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5455 void
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5456 resize_echo_area_axactly ()
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5457 {
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5458 if (BUFFERP (echo_area_buffer[0])
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5459 && WINDOWP (echo_area_window))
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5460 {
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5461 struct window *w = XWINDOW (echo_area_window);
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5462 int resized_p;
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5463
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5464 resized_p = with_echo_area_buffer (w, 0,
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5465 (int (*) ()) resize_mini_window,
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5466 w, 1);
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5467 if (resized_p)
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5468 {
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5469 ++windows_or_buffers_changed;
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5470 ++update_mode_lines;
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5471 redisplay_internal (0);
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5472 }
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5473 }
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5474 }
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5475
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5476
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5477 /* Resize mini-window W to fit the size of its contents. EXACT:P
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5478 means size the window exactly to the size needed. Otherwise, it's
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5479 only enlarged until W's buffer is empty. Value is non-zero if
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5480 the window height has been changed. */
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5481
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
5482 int
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5483 resize_mini_window (w, exact_p)
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5484 struct window *w;
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
5485 int exact_p;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5486 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5487 struct frame *f = XFRAME (w->frame);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5488 int window_height_changed_p = 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5489
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5490 xassert (MINI_WINDOW_P (w));
25403
5a3db5249db9 (resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents: 25394
diff changeset
5491
5a3db5249db9 (resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents: 25394
diff changeset
5492 /* Nil means don't try to resize. */
25832
148a6733cd83 (resize_mini_window): Do nothing if frame is an X
Gerd Moellmann <gerd@gnu.org>
parents: 25820
diff changeset
5493 if (NILP (Vmax_mini_window_height)
148a6733cd83 (resize_mini_window): Do nothing if frame is an X
Gerd Moellmann <gerd@gnu.org>
parents: 25820
diff changeset
5494 || (FRAME_X_P (f) && f->output_data.x == NULL))
25403
5a3db5249db9 (resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents: 25394
diff changeset
5495 return 0;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5496
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5497 if (!FRAME_MINIBUF_ONLY_P (f))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5498 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5499 struct it it;
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5500 struct window *root = XWINDOW (FRAME_ROOT_WINDOW (f));
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5501 int total_height = XFASTINT (root->height) + XFASTINT (w->height);
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5502 int height, max_height;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5503 int unit = CANON_Y_UNIT (f);
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5504 struct text_pos start;
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
5505
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5506 init_iterator (&it, w, BEGV, BEGV_BYTE, NULL, DEFAULT_FACE_ID);
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5507
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5508 /* Compute the max. number of lines specified by the user. */
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5509 if (FLOATP (Vmax_mini_window_height))
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5510 max_height = XFLOATINT (Vmax_mini_window_height) * total_height;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5511 else if (INTEGERP (Vmax_mini_window_height))
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5512 max_height = XINT (Vmax_mini_window_height);
25403
5a3db5249db9 (resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents: 25394
diff changeset
5513 else
5a3db5249db9 (resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents: 25394
diff changeset
5514 max_height = total_height / 4;
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5515
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5516 /* Correct that max. height if it's bogus. */
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5517 max_height = max (1, max_height);
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5518 max_height = min (total_height, max_height);
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5519
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5520 /* Find out the height of the text in the window. */
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5521 move_it_to (&it, ZV, -1, -1, -1, MOVE_TO_POS);
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5522 height = (unit - 1 + it.current_y + last_height) / unit;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5523 height = max (1, height);
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5524
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5525 /* Compute a suitable window start. */
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5526 if (height > max_height)
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5527 {
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5528 height = max_height;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5529 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID);
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5530 move_it_vertically_backward (&it, (height - 1) * unit);
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5531 start = it.current.pos;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5532 }
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5533 else
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5534 SET_TEXT_POS (start, BEGV, BEGV_BYTE);
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5535 SET_MARKER_FROM_TEXT_POS (w->start, start);
25388
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
5536
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
5537 /* Let it grow only, until we display an empty message, in which
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
5538 case the window shrinks again. */
25794
a6041d251b77 (resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents: 25778
diff changeset
5539 if (height > XFASTINT (w->height))
a6041d251b77 (resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents: 25778
diff changeset
5540 {
25729
7b888fb10913 (resize_mini_window): Don't report changed window
Gerd Moellmann <gerd@gnu.org>
parents: 25714
diff changeset
5541 int old_height = XFASTINT (w->height);
25794
a6041d251b77 (resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents: 25778
diff changeset
5542 freeze_window_starts (f, 1);
a6041d251b77 (resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents: 25778
diff changeset
5543 grow_mini_window (w, height - XFASTINT (w->height));
a6041d251b77 (resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents: 25778
diff changeset
5544 window_height_changed_p = XFASTINT (w->height) != old_height;
a6041d251b77 (resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents: 25778
diff changeset
5545 }
a6041d251b77 (resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents: 25778
diff changeset
5546 else if (height < XFASTINT (w->height)
a6041d251b77 (resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents: 25778
diff changeset
5547 && (exact_p || BEGV == ZV))
a6041d251b77 (resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents: 25778
diff changeset
5548 {
a6041d251b77 (resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents: 25778
diff changeset
5549 int old_height = XFASTINT (w->height);
a6041d251b77 (resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents: 25778
diff changeset
5550 freeze_window_starts (f, 0);
a6041d251b77 (resize_mini_window): Use grow_mini_window and
Gerd Moellmann <gerd@gnu.org>
parents: 25778
diff changeset
5551 shrink_mini_window (w);
25729
7b888fb10913 (resize_mini_window): Don't report changed window
Gerd Moellmann <gerd@gnu.org>
parents: 25714
diff changeset
5552 window_height_changed_p = XFASTINT (w->height) != old_height;
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
5553 }
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5554 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5555
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5556 return window_height_changed_p;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5557 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5558
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5559
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5560 /* Value is the current message, a string, or nil if there is no
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5561 current message. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5562
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5563 Lisp_Object
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5564 current_message ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5565 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5566 Lisp_Object msg;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5567
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5568 if (NILP (echo_area_buffer[0]))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5569 msg = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5570 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5571 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5572 with_echo_area_buffer (0, 0, (int (*) ()) current_message_1, &msg);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5573 if (NILP (msg))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5574 echo_area_buffer[0] = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5575 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5576
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5577 return msg;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5578 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5579
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5580
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5581 static int
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5582 current_message_1 (msg)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5583 Lisp_Object *msg;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5584 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5585 if (Z > BEG)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5586 *msg = make_buffer_string (BEG, Z, 1);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5587 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5588 *msg = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5589 return 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5590 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5591
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5592
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5593 /* Push the current message on Vmessage_stack for later restauration
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5594 by restore_message. Value is non-zero if the current message isn't
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5595 empty. This is a relatively infrequent operation, so it's not
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5596 worth optimizing. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5597
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5598 int
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5599 push_message ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5600 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5601 Lisp_Object msg;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5602 msg = current_message ();
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5603 Vmessage_stack = Fcons (msg, Vmessage_stack);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5604 return STRINGP (msg);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5605 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5606
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5607
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5608 /* Restore message display from the top of Vmessage_stack. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5609
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5610 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5611 restore_message ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5612 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5613 Lisp_Object msg;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5614
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5615 xassert (CONSP (Vmessage_stack));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5616 msg = XCAR (Vmessage_stack);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5617 if (STRINGP (msg))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5618 message3_nolog (msg, STRING_BYTES (XSTRING (msg)), STRING_MULTIBYTE (msg));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5619 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5620 message3_nolog (msg, 0, 0);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5621 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5622
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5623
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5624 /* Pop the top-most entry off Vmessage_stack. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5625
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5626 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5627 pop_message ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5628 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5629 xassert (CONSP (Vmessage_stack));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5630 Vmessage_stack = XCDR (Vmessage_stack);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5631 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5632
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5633
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5634 /* Check that Vmessage_stack is nil. Called from emacs.c when Emacs
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5635 exits. If the stack is not empty, we have a missing pop_message
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5636 somewhere. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5637
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5638 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5639 check_message_stack ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5640 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5641 if (!NILP (Vmessage_stack))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5642 abort ();
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5643 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5644
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5645
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5646 /* Truncate to NCHARS what will be displayed in the echo area the next
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5647 time we display it---but don't redisplay it now. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5648
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5649 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5650 truncate_echo_area (nchars)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5651 int nchars;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5652 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5653 if (nchars == 0)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5654 echo_area_buffer[0] = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5655 /* A null message buffer means that the frame hasn't really been
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5656 initialized yet. Error messages get reported properly by
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5657 cmd_error, so this must be just an informative message; toss it. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5658 else if (!noninteractive
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5659 && INTERACTIVE
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5660 && !NILP (echo_area_buffer[0]))
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5661 {
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5662 struct frame *sf = SELECTED_FRAME ();
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5663 if (FRAME_MESSAGE_BUF (sf))
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5664 with_echo_area_buffer (0, 0, (int (*) ()) truncate_message_1, nchars);
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5665 }
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5666 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5667
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5668
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5669 /* Helper function for truncate_echo_area. Truncate the current
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5670 message to at most NCHARS characters. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5671
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5672 static int
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5673 truncate_message_1 (nchars)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5674 int nchars;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5675 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5676 if (BEG + nchars < Z)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5677 del_range (BEG + nchars, Z);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5678 if (Z == BEG)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5679 echo_area_buffer[0] = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5680 return 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5681 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5682
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5683
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5684 /* Set the current message to a substring of S or STRING.
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5685
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5686 If STRING is a Lisp string, set the message to the first NBYTES
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5687 bytes from STRING. NBYTES zero means use the whole string. If
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5688 STRING is multibyte, the message will be displayed multibyte.
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5689
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5690 If S is not null, set the message to the first LEN bytes of S. LEN
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5691 zero means use the whole string. MULTIBYTE_P non-zero means S is
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5692 multibyte. Display the message multibyte in that case. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5693
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5694 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5695 set_message (s, string, nbytes, multibyte_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5696 char *s;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5697 Lisp_Object string;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5698 int nbytes;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5699 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5700 message_enable_multibyte
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5701 = ((s && multibyte_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5702 || (STRINGP (string) && STRING_MULTIBYTE (string)));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5703
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5704 with_echo_area_buffer (0, -1, (int (*) ()) set_message_1,
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5705 s, string, nbytes, multibyte_p);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5706 message_buf_print = 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5707 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5708
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5709
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5710 /* Helper function for set_message. Arguments have the same meaning
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5711 as there. This function is called with the echo area buffer being
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5712 current. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5713
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5714 static int
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5715 set_message_1 (s, string, nbytes, multibyte_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5716 char *s;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5717 Lisp_Object string;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5718 int nbytes, multibyte_p;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5719 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5720 xassert (BEG == Z);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5721
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5722 /* Change multibyteness of the echo buffer appropriately. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5723 if (message_enable_multibyte
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5724 != !NILP (current_buffer->enable_multibyte_characters))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5725 Fset_buffer_multibyte (message_enable_multibyte ? Qt : Qnil);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5726
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5727 /* Insert new message at BEG. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5728 TEMP_SET_PT_BOTH (BEG, BEG_BYTE);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5729
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5730 if (STRINGP (string))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5731 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5732 int nchars;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5733
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5734 if (nbytes == 0)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5735 nbytes = XSTRING (string)->size_byte;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5736 nchars = string_byte_to_char (string, nbytes);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5737
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5738 /* This function takes care of single/multibyte conversion. We
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5739 just have to ensure that the echo area buffer has the right
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5740 setting of enable_multibyte_characters. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5741 insert_from_string (string, 0, 0, nchars, nbytes, 1);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5742 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5743 else if (s)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5744 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5745 if (nbytes == 0)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5746 nbytes = strlen (s);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5747
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5748 if (multibyte_p && NILP (current_buffer->enable_multibyte_characters))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5749 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5750 /* Convert from multi-byte to single-byte. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5751 int i, c, n;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5752 unsigned char work[1];
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5753
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5754 /* Convert a multibyte string to single-byte. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5755 for (i = 0; i < nbytes; i += n)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5756 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5757 c = string_char_and_length (s + i, nbytes - i, &n);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5758 work[0] = (SINGLE_BYTE_CHAR_P (c)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5759 ? c
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5760 : multibyte_char_to_unibyte (c, Qnil));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5761 insert_1_both (work, 1, 1, 1, 0, 0);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5762 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5763 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5764 else if (!multibyte_p
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5765 && !NILP (current_buffer->enable_multibyte_characters))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5766 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5767 /* Convert from single-byte to multi-byte. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5768 int i, c, n;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5769 unsigned char *msg = (unsigned char *) s;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5770 unsigned char *str, work[4];
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5771
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5772 /* Convert a single-byte string to multibyte. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5773 for (i = 0; i < nbytes; i++)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5774 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5775 c = unibyte_char_to_multibyte (msg[i]);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5776 n = CHAR_STRING (c, work, str);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5777 insert_1_both (work, 1, n, 1, 0, 0);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5778 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5779 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5780 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5781 insert_1 (s, nbytes, 1, 0, 0);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5782 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5783
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5784 return 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5785 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5786
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5787
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5788 /* Clear messages. CURRENT_P non-zero means clear the current
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5789 message. LAST_DISPLAYED_P non-zero means clear the message
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5790 last displayed. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5791
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5792 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5793 clear_message (current_p, last_displayed_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5794 int current_p, last_displayed_p;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5795 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5796 if (current_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5797 echo_area_buffer[0] = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5798
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5799 if (last_displayed_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5800 echo_area_buffer[1] = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5801
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5802 message_buf_print = 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5803 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5804
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5805 /* Clear garbaged frames.
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5806
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5807 This function is used where the old redisplay called
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5808 redraw_garbaged_frames which in turn called redraw_frame which in
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5809 turn called clear_frame. The call to clear_frame was a source of
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5810 flickering. I believe a clear_frame is not necessary. It should
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5811 suffice in the new redisplay to invalidate all current matrices,
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5812 and ensure a complete redisplay of all windows. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5813
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5814 static void
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5815 clear_garbaged_frames ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5816 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5817 if (frame_garbaged)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5818 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5819 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5820
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5821 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5822 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5823 struct frame *f = XFRAME (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5824
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5825 if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5826 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5827 clear_current_matrices (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5828 f->garbaged = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5829 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5830 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5831
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
5832 frame_garbaged = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5833 ++windows_or_buffers_changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5834 }
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5835 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5836
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5837
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5838 /* Redisplay the echo area of the selected frame. If UPDATE_FRAME_P
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5839 is non-zero update selected_frame. Value is non-zero if the
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5840 mini-windows height has been changed. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5841
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5842 static int
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5843 echo_area_display (update_frame_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5844 int update_frame_p;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5845 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5846 Lisp_Object mini_window;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5847 struct window *w;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5848 struct frame *f;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5849 int window_height_changed_p = 0;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5850 struct frame *sf = SELECTED_FRAME ();
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5851
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5852 mini_window = FRAME_MINIBUF_WINDOW (sf);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5853 w = XWINDOW (mini_window);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5854 f = XFRAME (WINDOW_FRAME (w));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5855
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5856 /* Don't display if frame is invisible or not yet initialized. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5857 if (!FRAME_VISIBLE_P (f) || !f->glyphs_initialized_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5858 return 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5859
26103
90a7cc56474f (echo_area_display) [HAVE_X_WINDOWS]: Do nothing
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
5860 #ifdef HAVE_X_WINDOWS
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5861 /* When Emacs starts, selected_frame may be a visible terminal
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5862 frame, even if we run under a window system. If we let this
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5863 through, a message would be displayed on the terminal. */
26203
47d54b67bce2 * xdisp.c (echo_area_display) [HAVE_X_WINDOWS]: Do nothing if
Gerd Moellmann <gerd@gnu.org>
parents: 26197
diff changeset
5864 if (EQ (selected_frame, Vterminal_frame)
47d54b67bce2 * xdisp.c (echo_area_display) [HAVE_X_WINDOWS]: Do nothing if
Gerd Moellmann <gerd@gnu.org>
parents: 26197
diff changeset
5865 && !NILP (Vwindow_system))
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5866 return 0;
26103
90a7cc56474f (echo_area_display) [HAVE_X_WINDOWS]: Do nothing
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
5867 #endif /* HAVE_X_WINDOWS */
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5868
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5869 /* Redraw garbaged frames. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5870 if (frame_garbaged)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5871 clear_garbaged_frames ();
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5872
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5873 if (!NILP (echo_area_buffer[0]) || minibuf_level == 0)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5874 {
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5875 echo_area_window = mini_window;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5876 window_height_changed_p = display_echo_area (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5877 w->must_be_updated_p = 1;
25388
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
5878
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5879 if (update_frame_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5880 {
25388
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
5881 /* Not called from redisplay_internal. If we changed
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
5882 window configuration, we must redisplay thoroughly.
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
5883 Otherwise, we can do with updating what we displayed
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
5884 above. */
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
5885 if (window_height_changed_p)
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
5886 {
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
5887 ++windows_or_buffers_changed;
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
5888 ++update_mode_lines;
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
5889 redisplay_internal (0);
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
5890 }
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
5891 else if (FRAME_WINDOW_P (f))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5892 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5893 update_single_window (w, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5894 rif->flush_display (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5895 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5896 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5897 update_frame (f, 1, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5898 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5899 }
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5900 else if (!EQ (mini_window, selected_window))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5901 windows_or_buffers_changed++;
25388
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
5902
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
5903 /* Last displayed message is now the current message. */
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5904 echo_area_buffer[1] = echo_area_buffer[0];
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
5905
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5906 /* Prevent redisplay optimization in redisplay_internal by resetting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5907 this_line_start_pos. This is done because the mini-buffer now
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5908 displays the message instead of its buffer text. */
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5909 if (EQ (mini_window, selected_window))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5910 CHARPOS (this_line_start_pos) = 0;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5911
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5912 return window_height_changed_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5913 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5914
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5915
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
5916
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5917 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5918 Frame Titles
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5919 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5920
6308
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
5921
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
5922 #ifdef HAVE_WINDOW_SYSTEM
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5923
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5924 /* A buffer for constructing frame titles in it; allocated from the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5925 heap in init_xdisp and resized as needed in store_frame_title_char. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5926
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5927 static char *frame_title_buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5928
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5929 /* The buffer's end, and a current output position in it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5930
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5931 static char *frame_title_buf_end;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5932 static char *frame_title_ptr;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5933
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5934
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5935 /* Store a single character C for the frame title in frame_title_buf.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5936 Re-allocate frame_title_buf if necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5937
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5938 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5939 store_frame_title_char (c)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5940 char c;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5941 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5942 /* If output position has reached the end of the allocated buffer,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5943 double the buffer's size. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5944 if (frame_title_ptr == frame_title_buf_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5945 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5946 int len = frame_title_ptr - frame_title_buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5947 int new_size = 2 * len * sizeof *frame_title_buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5948 frame_title_buf = (char *) xrealloc (frame_title_buf, new_size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5949 frame_title_buf_end = frame_title_buf + new_size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5950 frame_title_ptr = frame_title_buf + len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5951 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5952
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5953 *frame_title_ptr++ = c;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5954 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5955
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5956
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5957 /* Store part of a frame title in frame_title_buf, beginning at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5958 frame_title_ptr. STR is the string to store. Do not copy more
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5959 than PRECISION number of bytes from STR; PRECISION <= 0 means copy
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5960 the whole string. Pad with spaces until FIELD_WIDTH number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5961 characters have been copied; FIELD_WIDTH <= 0 means don't pad.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5962 Called from display_mode_element when it is used to build a frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5963 title. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5964
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5965 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5966 store_frame_title (str, field_width, precision)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5967 unsigned char *str;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5968 int field_width, precision;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5969 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5970 int n = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5971
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5972 /* Copy at most PRECISION chars from STR. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5973 while ((precision <= 0 || n < precision)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5974 && *str)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5975 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5976 store_frame_title_char (*str++);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5977 ++n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5978 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5979
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5980 /* Fill up with spaces until FIELD_WIDTH reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5981 while (field_width > 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5982 && n < field_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5983 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5984 store_frame_title_char (' ');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5985 ++n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5986 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5987
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5988 return n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5989 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5990
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5991
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5992 /* Set the title of FRAME, if it has changed. The title format is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5993 Vicon_title_format if FRAME is iconified, otherwise it is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5994 frame_title_format. */
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
5995
6308
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
5996 static void
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
5997 x_consider_frame_title (frame)
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
5998 Lisp_Object frame;
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
5999 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6000 struct frame *f = XFRAME (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6001
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6002 if (FRAME_WINDOW_P (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6003 || FRAME_MINIBUF_ONLY_P (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6004 || f->explicit_name)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6005 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6006 /* Do we have more than one visible frame on this X display? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6007 Lisp_Object tail;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6008 Lisp_Object fmt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6009 struct buffer *obuf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6010 int len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6011 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6012
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
6013 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
6014 {
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
6015 struct frame *tf = XFRAME (XCAR (tail));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6016
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6017 if (tf != f
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6018 && FRAME_KBOARD (tf) == FRAME_KBOARD (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6019 && !FRAME_MINIBUF_ONLY_P (tf)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6020 && (FRAME_VISIBLE_P (tf) || FRAME_ICONIFIED_P (tf)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6021 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6022 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6023
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6024 /* Set global variable indicating that multiple frames exist. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6025 multiple_frames = CONSP (tail);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6026
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6027 /* Switch to the buffer of selected window of the frame. Set up
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6028 frame_title_ptr so that display_mode_element will output into it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6029 then display the title. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6030 obuf = current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6031 Fset_buffer (XWINDOW (f->selected_window)->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6032 fmt = FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6033 frame_title_ptr = frame_title_buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6034 init_iterator (&it, XWINDOW (f->selected_window), -1, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6035 NULL, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6036 len = display_mode_element (&it, 0, -1, -1, fmt);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6037 frame_title_ptr = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6038 set_buffer_internal (obuf);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6039
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6040 /* Set the title only if it's changed. This avoids consing in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6041 the common case where it hasn't. (If it turns out that we've
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6042 already wasted too much time by walking through the list with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6043 display_mode_element, then we might need to optimize at a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6044 higher level than this.) */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6045 if (! STRINGP (f->name)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6046 || STRING_BYTES (XSTRING (f->name)) != len
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6047 || bcmp (frame_title_buf, XSTRING (f->name)->data, len) != 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6048 x_implicitly_set_name (f, make_string (frame_title_buf, len), Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6049 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6050 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6051
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6052 #else /* not HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6053
8783
226c214398a6 [!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents: 8772
diff changeset
6054 #define frame_title_ptr ((char *)0)
8918
1be99ca9da45 [!HAVE_X_WINDOWS] (store_frame_title): Dummy macro.
Karl Heuer <kwzh@gnu.org>
parents: 8834
diff changeset
6055 #define store_frame_title(str, mincol, maxcol) 0
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6056
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6057 #endif /* not HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6058
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6059
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6060
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6061
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6062 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6063 Menu Bars
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6064 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6065
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6066
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6067 /* Prepare for redisplay by updating menu-bar item lists when
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6068 appropriate. This can call eval. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6069
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6070 void
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6071 prepare_menu_bars ()
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6072 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6073 int all_windows;
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6074 struct gcpro gcpro1, gcpro2;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6075 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6076 struct frame *tooltip_frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6077
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6078 #ifdef HAVE_X_WINDOWS
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6079 tooltip_frame = tip_frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6080 #else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6081 tooltip_frame = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6082 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6083
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6084 /* Update all frame titles based on their buffer names, etc. We do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6085 this before the menu bars so that the buffer-menu will show the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6086 up-to-date frame titles. */
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
6087 #ifdef HAVE_WINDOW_SYSTEM
13826
cbe1d1a07eb2 (prepare_menu_bars): If update_mode_lines,
Richard M. Stallman <rms@gnu.org>
parents: 13760
diff changeset
6088 if (windows_or_buffers_changed || update_mode_lines)
11920
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
6089 {
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
6090 Lisp_Object tail, frame;
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
6091
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
6092 FOR_EACH_FRAME (tail, frame)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6093 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6094 f = XFRAME (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6095 if (f != tooltip_frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6096 && (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6097 x_consider_frame_title (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6098 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6099 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6100 #endif /* HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6101
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6102 /* Update the menu bar item lists, if appropriate. This has to be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6103 done before any actual redisplay or generation of display lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6104 all_windows = (update_mode_lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6105 || buffer_shared > 1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6106 || windows_or_buffers_changed);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6107 if (all_windows)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6108 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6109 Lisp_Object tail, frame;
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6110 int count = specpdl_ptr - specpdl;
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6111
21179
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
6112 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6113
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6114 FOR_EACH_FRAME (tail, frame)
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6115 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6116 f = XFRAME (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6117
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6118 /* Ignore tooltip frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6119 if (f == tooltip_frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6120 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6121
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6122 /* If a window on this frame changed size, report that to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6123 the user and clear the size-change flag. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6124 if (FRAME_WINDOW_SIZES_CHANGED (f))
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6125 {
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6126 Lisp_Object functions;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6127
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6128 /* Clear flag first in case we get an error below. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6129 FRAME_WINDOW_SIZES_CHANGED (f) = 0;
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6130 functions = Vwindow_size_change_functions;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6131 GCPRO2 (tail, functions);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6132
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6133 while (CONSP (functions))
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6134 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6135 call1 (XCAR (functions), frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6136 functions = XCDR (functions);
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6137 }
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6138 UNGCPRO;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6139 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6140
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6141 GCPRO1 (tail);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6142 update_menu_bar (f, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6143 #ifdef HAVE_WINDOW_SYSTEM
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6144 update_tool_bar (f, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6145 #endif
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6146 UNGCPRO;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6147 }
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6148
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6149 unbind_to (count, Qnil);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6150 }
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
6151 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6152 {
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6153 struct frame *sf = SELECTED_FRAME ();
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6154 update_menu_bar (sf, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6155 #ifdef HAVE_WINDOW_SYSTEM
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6156 update_tool_bar (sf, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6157 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6158 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6159
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6160 /* Motif needs this. See comment in xmenu.c. Turn it off when
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6161 pending_menu_activation is not defined. */
15813
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
6162 #ifdef USE_X_TOOLKIT
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
6163 pending_menu_activation = 0;
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
6164 #endif
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6165 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6166
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6167
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6168 /* Update the menu bar item list for frame F. This has to be done
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6169 before we start to fill in any display lines, because it can call
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6170 eval.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6171
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6172 If SAVE_MATCH_DATA is non-zero, we must save and restore it here. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6173
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6174 static void
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6175 update_menu_bar (f, save_match_data)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6176 struct frame *f;
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6177 int save_match_data;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6178 {
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
6179 Lisp_Object window;
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
6180 register struct window *w;
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6181
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
6182 window = FRAME_SELECTED_WINDOW (f);
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
6183 w = XWINDOW (window);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6184
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6185 if (update_mode_lines)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6186 w->update_mode_line = Qt;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6187
14265
9bc9be522a4d (update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents: 14263
diff changeset
6188 if (FRAME_WINDOW_P (f)
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
6189 ?
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
6190 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
6191 FRAME_EXTERNAL_MENU_BAR (f)
5676
b5027523c90d Wed Jan 26 12:23:12 1994 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu)
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 5658
diff changeset
6192 #else
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
6193 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
6194 #endif
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
6195 : FRAME_MENU_BAR_LINES (f) > 0)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6196 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6197 /* 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
6198 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
6199 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
6200 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
6201 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
6202 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
6203 windows_or_buffers_changed anyway. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6204 if (windows_or_buffers_changed
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
6205 || !NILP (w->update_mode_line)
15543
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6206 || ((BUF_SAVE_MODIFF (XBUFFER (w->buffer))
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6207 < BUF_MODIFF (XBUFFER (w->buffer)))
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6208 != !NILP (w->last_had_star))
12022
497ad07c31c2 (update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents: 12017
diff changeset
6209 || ((!NILP (Vtransient_mark_mode)
497ad07c31c2 (update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents: 12017
diff changeset
6210 && !NILP (XBUFFER (w->buffer)->mark_active))
497ad07c31c2 (update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents: 12017
diff changeset
6211 != !NILP (w->region_showing)))
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6212 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6213 struct buffer *prev = current_buffer;
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6214 int count = specpdl_ptr - specpdl;
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6215
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
6216 set_buffer_internal_1 (XBUFFER (w->buffer));
12017
0d73575a1c0e (update_menu_bar): Reverse test of save_match_data.
Karl Heuer <kwzh@gnu.org>
parents: 11971
diff changeset
6217 if (save_match_data)
21179
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
6218 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
6219 if (NILP (Voverriding_local_map_menu_flag))
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
6220 {
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
6221 specbind (Qoverriding_terminal_local_map, Qnil);
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
6222 specbind (Qoverriding_local_map, Qnil);
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
6223 }
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6224
12141
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
6225 /* Run the Lucid hook. */
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
6226 call1 (Vrun_hooks, Qactivate_menubar_hook);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6227
12141
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
6228 /* If it has changed current-menubar from previous value,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6229 really recompute the menu-bar from the value. */
12141
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
6230 if (! NILP (Vlucid_menu_bar_dirty_flag))
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
6231 call0 (Qrecompute_lucid_menubar);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6232
14299
037a89c9d068 (update_menu_bar):
Karl Heuer <kwzh@gnu.org>
parents: 14265
diff changeset
6233 safe_run_hooks (Qmenu_bar_update_hook);
6134
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
6234 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6235
15543
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6236 /* Redisplay the menu bar in case we changed it. */
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
6237 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
14265
9bc9be522a4d (update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents: 14263
diff changeset
6238 if (FRAME_WINDOW_P (f))
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
6239 set_frame_menubar (f, 0, 0);
15543
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6240 else
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6241 /* On a terminal screen, the menu bar is an ordinary screen
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6242 line, and this makes it get updated. */
15543
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6243 w->update_mode_line = Qt;
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6244 #else /* ! (USE_X_TOOLKIT || HAVE_NTGUI) */
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6245 /* In the non-toolkit version, the menu bar is an ordinary screen
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6246 line, and this makes it get updated. */
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6247 w->update_mode_line = Qt;
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6248 #endif /* ! (USE_X_TOOLKIT || HAVE_NTGUI) */
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6249
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6250 unbind_to (count, Qnil);
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
6251 set_buffer_internal_1 (prev);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6252 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6253 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6254 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6255
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6256
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6257
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6258 /***********************************************************************
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6259 Tool-bars
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6260 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6261
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6262 #ifdef HAVE_WINDOW_SYSTEM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6263
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6264 /* Update the tool-bar item list for frame F. This has to be done
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6265 before we start to fill in any display lines. Called from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6266 prepare_menu_bars. If SAVE_MATCH_DATA is non-zero, we must save
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6267 and restore it here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6268
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6269 static void
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6270 update_tool_bar (f, save_match_data)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6271 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6272 int save_match_data;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6273 {
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6274 if (WINDOWP (f->tool_bar_window)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6275 && XFASTINT (XWINDOW (f->tool_bar_window)->height) > 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6276 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6277 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6278 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6279
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6280 window = FRAME_SELECTED_WINDOW (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6281 w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6282
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6283 /* If the user has switched buffers or windows, we need to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6284 recompute to reflect the new bindings. But we'll
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6285 recompute when update_mode_lines is set too; that means
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6286 that people can use force-mode-line-update to request
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6287 that the menu bar be recomputed. The adverse effect on
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6288 the rest of the redisplay algorithm is about the same as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6289 windows_or_buffers_changed anyway. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6290 if (windows_or_buffers_changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6291 || !NILP (w->update_mode_line)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6292 || ((BUF_SAVE_MODIFF (XBUFFER (w->buffer))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6293 < BUF_MODIFF (XBUFFER (w->buffer)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6294 != !NILP (w->last_had_star))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6295 || ((!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6296 && !NILP (XBUFFER (w->buffer)->mark_active))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6297 != !NILP (w->region_showing)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6298 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6299 struct buffer *prev = current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6300 int count = specpdl_ptr - specpdl;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6301
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6302 /* Set current_buffer to the buffer of the selected
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6303 window of the frame, so that we get the right local
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6304 keymaps. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6305 set_buffer_internal_1 (XBUFFER (w->buffer));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6306
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6307 /* Save match data, if we must. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6308 if (save_match_data)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6309 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6310
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6311 /* Make sure that we don't accidentally use bogus keymaps. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6312 if (NILP (Voverriding_local_map_menu_flag))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6313 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6314 specbind (Qoverriding_terminal_local_map, Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6315 specbind (Qoverriding_local_map, Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6316 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6317
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6318 /* Build desired tool-bar items from keymaps. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6319 f->desired_tool_bar_items
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6320 = tool_bar_items (f->desired_tool_bar_items,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6321 &f->n_desired_tool_bar_items);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6322
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6323 /* Redisplay the tool-bar in case we changed it. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6324 w->update_mode_line = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6325
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6326 unbind_to (count, Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6327 set_buffer_internal_1 (prev);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6328 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6329 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6330 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6331
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6332
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6333 /* Set F->desired_tool_bar_string to a Lisp string representing frame
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6334 F's desired tool-bar contents. F->desired_tool_bar_items must have
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6335 been set up previously by calling prepare_menu_bars. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6336
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6337 static void
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6338 build_desired_tool_bar_string (f)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6339 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6340 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6341 int i, size, size_needed, string_idx;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6342 struct gcpro gcpro1, gcpro2, gcpro3;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6343 Lisp_Object image, plist, props;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6344
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6345 image = plist = props = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6346 GCPRO3 (image, plist, props);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6347
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6348 /* Prepare F->desired_tool_bar_string. If we can reuse it, do so.
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6349 Otherwise, make a new string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6350
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6351 /* The size of the string we might be able to reuse. */
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6352 size = (STRINGP (f->desired_tool_bar_string)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6353 ? XSTRING (f->desired_tool_bar_string)->size
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6354 : 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6355
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6356 /* Each image in the string we build is preceded by a space,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6357 and there is a space at the end. */
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6358 size_needed = f->n_desired_tool_bar_items + 1;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6359
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6360 /* Reuse f->desired_tool_bar_string, if possible. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6361 if (size < size_needed)
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6362 f->desired_tool_bar_string = Fmake_string (make_number (size_needed), ' ');
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6363 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6364 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6365 props = list4 (Qdisplay, Qnil, Qmenu_item, Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6366 Fremove_text_properties (make_number (0), make_number (size),
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6367 props, f->desired_tool_bar_string);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6368 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6369
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6370 /* Put a `display' property on the string for the images to display,
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6371 put a `menu_item' property on tool-bar items with a value that
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6372 is the index of the item in F's tool-bar item vector. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6373 for (i = 0, string_idx = 0;
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6374 i < f->n_desired_tool_bar_items;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6375 ++i, string_idx += 1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6376 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6377 #define PROP(IDX) \
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6378 (XVECTOR (f->desired_tool_bar_items) \
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6379 ->contents[i * TOOL_BAR_ITEM_NSLOTS + (IDX)])
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6380
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6381 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6382 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6383 int margin, relief;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6384 extern Lisp_Object QCrelief, QCmargin, QCalgorithm, Qimage;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6385 extern Lisp_Object Qlaplace;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6386
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6387 /* If image is a vector, choose the image according to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6388 button state. */
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6389 image = PROP (TOOL_BAR_ITEM_IMAGES);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6390 if (VECTORP (image))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6391 {
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6392 enum tool_bar_item_image idx;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6393
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6394 if (enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6395 idx = (selected_p
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6396 ? TOOL_BAR_IMAGE_ENABLED_SELECTED
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6397 : TOOL_BAR_IMAGE_ENABLED_DESELECTED);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6398 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6399 idx = (selected_p
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6400 ? TOOL_BAR_IMAGE_DISABLED_SELECTED
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6401 : TOOL_BAR_IMAGE_DISABLED_DESELECTED);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6402
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6403 xassert (XVECTOR (image)->size >= idx);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6404 image = XVECTOR (image)->contents[idx];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6405 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6406
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6407 /* Ignore invalid image specifications. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6408 if (!valid_image_p (image))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6409 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6410
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6411 /* Display the tool-bar button pressed, or depressed. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6412 plist = Fcopy_sequence (XCDR (image));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6413
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6414 /* Compute margin and relief to draw. */
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6415 relief = tool_bar_button_relief > 0 ? tool_bar_button_relief : 3;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6416 margin = relief + max (0, tool_bar_button_margin);
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6417
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6418 if (auto_raise_tool_bar_buttons_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6419 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6420 /* Add a `:relief' property to the image spec if the item is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6421 selected. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6422 if (selected_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6423 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6424 plist = Fplist_put (plist, QCrelief, make_number (-relief));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6425 margin -= relief;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6426 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6427 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6428 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6429 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6430 /* If image is selected, display it pressed, i.e. with a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6431 negative relief. If it's not selected, display it with a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6432 raised relief. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6433 plist = Fplist_put (plist, QCrelief,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6434 (selected_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6435 ? make_number (-relief)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6436 : make_number (relief)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6437 margin -= relief;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6438 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6439
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6440 /* Put a margin around the image. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6441 if (margin)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6442 plist = Fplist_put (plist, QCmargin, make_number (margin));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6443
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6444 /* If button is not enabled, make the image appear disabled by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6445 applying an appropriate algorithm to it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6446 if (!enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6447 plist = Fplist_put (plist, QCalgorithm, Qlaplace);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6448
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6449 /* Put a `display' text property on the string for the image to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6450 display. Put a `menu-item' property on the string that gives
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6451 the start of this item's properties in the tool-bar items
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6452 vector. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6453 image = Fcons (Qimage, plist);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6454 props = list4 (Qdisplay, image,
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6455 Qmenu_item, make_number (i * TOOL_BAR_ITEM_NSLOTS)),
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6456 Fadd_text_properties (make_number (string_idx),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6457 make_number (string_idx + 1),
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6458 props, f->desired_tool_bar_string);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6459 #undef PROP
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6460 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6461
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6462 UNGCPRO;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6463 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6464
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6465
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6466 /* Display one line of the tool-bar of frame IT->f. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6467
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6468 static void
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6469 display_tool_bar_line (it)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6470 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6471 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6472 struct glyph_row *row = it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6473 int max_x = it->last_visible_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6474 struct glyph *last;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6475
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6476 prepare_desired_row (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6477 row->y = it->current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6478
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6479 while (it->current_x < max_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6480 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6481 int x_before, x, n_glyphs_before, i, nglyphs;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6482
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6483 /* Get the next display element. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6484 if (!get_next_display_element (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6485 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6486
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6487 /* Produce glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6488 x_before = it->current_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6489 n_glyphs_before = it->glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6490 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6491
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6492 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6493 i = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6494 x = x_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6495 while (i < nglyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6496 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6497 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6498
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6499 if (x + glyph->pixel_width > max_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6500 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6501 /* Glyph doesn't fit on line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6502 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6503 it->current_x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6504 goto out;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6505 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6506
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6507 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6508 x += glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6509 ++i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6510 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6511
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6512 /* Stop at line ends. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6513 if (ITERATOR_AT_END_OF_LINE_P (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6514 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6515
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6516 set_iterator_to_next (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6517 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6518
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6519 out:;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6520
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6521 row->displays_text_p = row->used[TEXT_AREA] != 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6522 extend_face_to_end_of_line (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6523 last = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA] - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6524 last->right_box_line_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6525 compute_line_metrics (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6526
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6527 /* If line is empty, make it occupy the rest of the tool-bar. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6528 if (!row->displays_text_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6529 {
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
6530 row->height = row->phys_height = it->last_visible_y - row->y;
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
6531 row->ascent = row->phys_ascent = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6532 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6533
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6534 row->full_width_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6535 row->continued_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6536 row->truncated_on_left_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6537 row->truncated_on_right_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6538
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6539 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6540 it->current_y += row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6541 ++it->vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6542 ++it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6543 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6544
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6545
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6546 /* Value is the number of screen lines needed to make all tool-bar
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6547 items of frame F visible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6548
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6549 static int
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6550 tool_bar_lines_needed (f)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6551 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6552 {
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6553 struct window *w = XWINDOW (f->tool_bar_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6554 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6555
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6556 /* Initialize an iterator for iteration over
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6557 F->desired_tool_bar_string in the tool-bar window of frame F. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6558 init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6559 it.first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6560 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f);
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6561 reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6562
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6563 while (!ITERATOR_AT_END_P (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6564 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6565 it.glyph_row = w->desired_matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6566 clear_glyph_row (it.glyph_row);
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6567 display_tool_bar_line (&it);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6568 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6569
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6570 return (it.current_y + CANON_Y_UNIT (f) - 1) / CANON_Y_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6571 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6572
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6573
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6574 /* Display the tool-bar of frame F. Value is non-zero if tool-bar's
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6575 height should be changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6576
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6577 static int
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6578 redisplay_tool_bar (f)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6579 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6580 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6581 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6582 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6583 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6584 int change_height_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6585
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6586 /* If frame hasn't a tool-bar window or if it is zero-height, don't
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6587 do anything. This means you must start with tool-bar-lines
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6588 non-zero to get the auto-sizing effect. Or in other words, you
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6589 can turn off tool-bars by specifying tool-bar-lines zero. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6590 if (!WINDOWP (f->tool_bar_window)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6591 || (w = XWINDOW (f->tool_bar_window),
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6592 XFASTINT (w->height) == 0))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6593 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6594
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6595 /* Set up an iterator for the tool-bar window. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6596 init_iterator (&it, w, -1, -1, w->desired_matrix->rows, TOOL_BAR_FACE_ID);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6597 it.first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6598 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6599 row = it.glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6600
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6601 /* Build a string that represents the contents of the tool-bar. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6602 build_desired_tool_bar_string (f);
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6603 reseat_to_string (&it, NULL, f->desired_tool_bar_string, 0, 0, 0, -1);
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6604
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6605 /* Display as many lines as needed to display all tool-bar items. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6606 while (it.current_y < it.last_visible_y)
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6607 display_tool_bar_line (&it);
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6608
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6609 /* It doesn't make much sense to try scrolling in the tool-bar
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6610 window, so don't do it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6611 w->desired_matrix->no_scrolling_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6612 w->must_be_updated_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6613
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6614 if (auto_resize_tool_bars_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6615 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6616 int nlines;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6617
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6618 /* If there are blank lines at the end, except for a partially
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6619 visible blank line at the end that is smaller than
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6620 CANON_Y_UNIT, change the tool-bar's height. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6621 row = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6622 if (!row->displays_text_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6623 && row->height >= CANON_Y_UNIT (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6624 change_height_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6625
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6626 /* If row displays tool-bar items, but is partially visible,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6627 change the tool-bar's height. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6628 if (row->displays_text_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6629 && MATRIX_ROW_BOTTOM_Y (row) > it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6630 change_height_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6631
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6632 /* Resize windows as needed by changing the `tool-bar-lines'
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6633 frame parameter. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6634 if (change_height_p
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6635 && (nlines = tool_bar_lines_needed (f),
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6636 nlines != XFASTINT (w->height)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6637 {
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6638 extern Lisp_Object Qtool_bar_lines;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6639 Lisp_Object frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6640
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6641 XSETFRAME (frame, f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6642 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6643 Fmodify_frame_parameters (frame,
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6644 Fcons (Fcons (Qtool_bar_lines,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6645 make_number (nlines)),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6646 Qnil));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6647 fonts_changed_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6648 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6649 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6650
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6651 return change_height_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6652 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6653
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6654
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6655 /* Get information about the tool-bar item which is displayed in GLYPH
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6656 on frame F. Return in *PROP_IDX the index where tool-bar item
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6657 properties start in F->current_tool_bar_items. Value is zero if
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6658 GLYPH doesn't display a tool-bar item. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6659
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6660 int
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6661 tool_bar_item_info (f, glyph, prop_idx)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6662 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6663 struct glyph *glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6664 int *prop_idx;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6665 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6666 Lisp_Object prop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6667 int success_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6668
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6669 /* Get the text property `menu-item' at pos. The value of that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6670 property is the start index of this item's properties in
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6671 F->current_tool_bar_items. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6672 prop = Fget_text_property (make_number (glyph->charpos),
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6673 Qmenu_item, f->current_tool_bar_string);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6674 if (INTEGERP (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6675 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6676 *prop_idx = XINT (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6677 success_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6678 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6679 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6680 success_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6681
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6682 return success_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6683 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6684
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6685 #endif /* HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6686
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6687
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6688
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6689 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6690 Horizontal scrolling
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6691 ************************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6692
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6693 static int hscroll_window_tree P_ ((Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6694 static int hscroll_windows P_ ((Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6695
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6696 /* For all leaf windows in the window tree rooted at WINDOW, set their
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6697 hscroll value so that PT is (i) visible in the window, and (ii) so
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6698 that it is not within a certain margin at the window's left and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6699 right border. Value is non-zero if any window's hscroll has been
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6700 changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6701
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6702 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6703 hscroll_window_tree (window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6704 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6705 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6706 int hscrolled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6707
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6708 while (WINDOWP (window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6709 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6710 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6711
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6712 if (WINDOWP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6713 hscrolled_p |= hscroll_window_tree (w->hchild);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6714 else if (WINDOWP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6715 hscrolled_p |= hscroll_window_tree (w->vchild);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6716 else if (w->cursor.vpos >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6717 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6718 int hscroll_margin, text_area_x, text_area_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6719 int text_area_width, text_area_height;
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6720 struct glyph_row *current_cursor_row
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6721 = MATRIX_ROW (w->current_matrix, w->cursor.vpos);
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6722 struct glyph_row *desired_cursor_row
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6723 = MATRIX_ROW (w->desired_matrix, w->cursor.vpos);
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6724 struct glyph_row *cursor_row
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6725 = (desired_cursor_row->enabled_p
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6726 ? desired_cursor_row
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6727 : current_cursor_row);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6728
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6729 window_box (w, TEXT_AREA, &text_area_x, &text_area_y,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6730 &text_area_width, &text_area_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6731
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6732 /* Scroll when cursor is inside this scroll margin. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6733 hscroll_margin = 5 * CANON_X_UNIT (XFRAME (w->frame));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6734
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6735 if ((XFASTINT (w->hscroll)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6736 && w->cursor.x < hscroll_margin)
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6737 || (cursor_row->enabled_p
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6738 && cursor_row->truncated_on_right_p
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6739 && (w->cursor.x > text_area_width - hscroll_margin)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6740 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6741 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6742 int hscroll;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6743 struct buffer *saved_current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6744 int pt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6745
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6746 /* Find point in a display of infinite width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6747 saved_current_buffer = current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6748 current_buffer = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6749
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6750 if (w == XWINDOW (selected_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6751 pt = BUF_PT (current_buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6752 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6753 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6754 pt = marker_position (w->pointm);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6755 pt = max (BEGV, pt);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6756 pt = min (ZV, pt);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6757 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6758
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6759 /* Move iterator to pt starting at cursor_row->start in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6760 a line with infinite width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6761 init_to_row_start (&it, w, cursor_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6762 it.last_visible_x = INFINITY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6763 move_it_in_display_line_to (&it, pt, -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6764 current_buffer = saved_current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6765
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6766 /* Center cursor in window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6767 hscroll = (max (0, it.current_x - text_area_width / 2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6768 / CANON_X_UNIT (it.f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6769
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6770 /* Don't call Fset_window_hscroll if value hasn't
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6771 changed because it will prevent redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6772 optimizations. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6773 if (XFASTINT (w->hscroll) != hscroll)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6774 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6775 Fset_window_hscroll (window, make_number (hscroll));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6776 hscrolled_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6777 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6778 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6779 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6780
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6781 window = w->next;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6782 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6783
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6784 /* Value is non-zero if hscroll of any leaf window has been changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6785 return hscrolled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6786 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6787
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6788
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6789 /* Set hscroll so that cursor is visible and not inside horizontal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6790 scroll margins for all windows in the tree rooted at WINDOW. See
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6791 also hscroll_window_tree above. Value is non-zero if any window's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6792 hscroll has been changed. If it has, desired matrices on the frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6793 of WINDOW are cleared. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6794
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6795 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6796 hscroll_windows (window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6797 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6798 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6799 int hscrolled_p = hscroll_window_tree (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6800 if (hscrolled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6801 clear_desired_matrices (XFRAME (WINDOW_FRAME (XWINDOW (window))));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6802 return hscrolled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6803 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6804
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6805
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6806
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6807 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6808 Redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6809 ************************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6810
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6811 /* Variables holding some state of redisplay if GLYPH_DEBUG is defined
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6812 to a non-zero value. This is sometimes handy to have in a debugger
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6813 session. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6814
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6815 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6816
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6817 /* First and last unchanged row for try_window_id. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6818
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6819 int debug_first_unchanged_at_end_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6820 int debug_last_unchanged_at_beg_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6821
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6822 /* Delta vpos and y. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6823
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6824 int debug_dvpos, debug_dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6825
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6826 /* Delta in characters and bytes for try_window_id. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6827
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6828 int debug_delta, debug_delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6829
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6830 /* Values of window_end_pos and window_end_vpos at the end of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6831 try_window_id. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6832
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6833 int debug_end_pos, debug_end_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6834
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6835 /* Append a string to W->desired_matrix->method. FMT is a printf
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6836 format string. A1...A9 are a supplement for a variable-length
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6837 argument list. If trace_redisplay_p is non-zero also printf the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6838 resulting string to stderr. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6839
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6840 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6841 debug_method_add (w, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6842 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6843 char *fmt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6844 int a1, a2, a3, a4, a5, a6, a7, a8, a9;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6845 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6846 char buffer[512];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6847 char *method = w->desired_matrix->method;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6848 int len = strlen (method);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6849 int size = sizeof w->desired_matrix->method;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6850 int remaining = size - len - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6851
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6852 sprintf (buffer, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6853 if (len && remaining)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6854 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6855 method[len] = '|';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6856 --remaining, ++len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6857 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6858
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6859 strncpy (method + len, buffer, remaining);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6860
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6861 if (trace_redisplay_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6862 fprintf (stderr, "%p (%s): %s\n",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6863 w,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6864 ((BUFFERP (w->buffer)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6865 && STRINGP (XBUFFER (w->buffer)->name))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6866 ? (char *) XSTRING (XBUFFER (w->buffer)->name)->data
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6867 : "no buffer"),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6868 buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6869 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6870
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6871 #endif /* GLYPH_DEBUG */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6872
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6873
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6874 /* This counter is used to clear the face cache every once in a while
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6875 in redisplay_internal. It is incremented for each redisplay.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6876 Every CLEAR_FACE_CACHE_COUNT full redisplays, the face cache is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6877 cleared. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6878
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6879 #define CLEAR_FACE_CACHE_COUNT 10000
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6880 static int clear_face_cache_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6881
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6882 /* Record the previous terminal frame we displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6883
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6884 static struct frame *previous_terminal_frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6885
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6886 /* Non-zero while redisplay_internal is in progress. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6887
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6888 int redisplaying_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6889
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6890
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6891 /* Value is non-zero if all changes in window W, which displays
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6892 current_buffer, are in the text between START and END. START is a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6893 buffer position, END is given as a distance from Z. Used in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6894 redisplay_internal for display optimization. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6895
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6896 static INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6897 text_outside_line_unchanged_p (w, start, end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6898 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6899 int start, end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6900 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6901 int unchanged_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6902
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6903 /* If text or overlays have changed, see where. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6904 if (XFASTINT (w->last_modified) < MODIFF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6905 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6906 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6907 /* Gap in the line? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6908 if (GPT < start || Z - GPT < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6909 unchanged_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6910
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6911 /* Changes start in front of the line, or end after it? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6912 if (unchanged_p
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6913 && (BEG_UNCHANGED < start - 1
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6914 || END_UNCHANGED < end))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6915 unchanged_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6916
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6917 /* If selective display, can't optimize if changes start at the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6918 beginning of the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6919 if (unchanged_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6920 && INTEGERP (current_buffer->selective_display)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6921 && XINT (current_buffer->selective_display) > 0
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6922 && (BEG_UNCHANGED < start || GPT <= start))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6923 unchanged_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6924 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6925
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6926 return unchanged_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6927 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6928
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6929
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6930 /* Do a frame update, taking possible shortcuts into account. This is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6931 the main external entry point for redisplay.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6932
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6933 If the last redisplay displayed an echo area message and that message
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6934 is no longer requested, we clear the echo area or bring back the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6935 mini-buffer if that is in use. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6936
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6937 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6938 redisplay ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6939 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6940 redisplay_internal (0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6941 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6942
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6943
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6944 /* Reconsider the setting of B->clip_changed which is displayed
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6945 in window W. */
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6946
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6947 static INLINE void
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6948 reconsider_clip_changes (w, b)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6949 struct window *w;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6950 struct buffer *b;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6951 {
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6952 if (b->prevent_redisplay_optimizations_p)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6953 b->clip_changed = 1;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6954 else if (b->clip_changed
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6955 && !NILP (w->window_end_valid)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6956 && w->current_matrix->buffer == b
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6957 && w->current_matrix->zv == BUF_ZV (b)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6958 && w->current_matrix->begv == BUF_BEGV (b))
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6959 b->clip_changed = 0;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6960 }
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6961
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6962
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6963 /* If PRESERVE_ECHO_AREA is nonzero, it means this redisplay is not in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6964 response to any user action; therefore, we should preserve the echo
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6965 area. (Actually, our caller does that job.) Perhaps in the future
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6966 avoid recentering windows if it is not necessary; currently that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6967 causes some problems. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6968
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6969 static void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6970 redisplay_internal (preserve_echo_area)
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
6971 int preserve_echo_area;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6972 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6973 struct window *w = XWINDOW (selected_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6974 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6975 int pause;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6976 int must_finish = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6977 struct text_pos tlbufpos, tlendpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6978 int number_of_visible_frames;
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
6979 int count;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6980 struct frame *sf = SELECTED_FRAME ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6981
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6982 /* Non-zero means redisplay has to consider all windows on all
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6983 frames. Zero means, only selected_window is considered. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6984 int consider_all_windows_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6985
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6986 TRACE ((stderr, "redisplay_internal %d\n", redisplaying_p));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6987
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6988 /* No redisplay if running in batch mode or frame is not yet fully
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6989 initialized, or redisplay is explicitly turned off by setting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6990 Vinhibit_redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6991 if (noninteractive
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6992 || !NILP (Vinhibit_redisplay)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6993 || !f->glyphs_initialized_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6994 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6995
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6996 /* The flag redisplay_performed_directly_p is set by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6997 direct_output_for_insert when it already did the whole screen
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6998 update necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6999 if (redisplay_performed_directly_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7000 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7001 redisplay_performed_directly_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7002 if (!hscroll_windows (selected_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7003 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7004 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7005
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7006 #ifdef USE_X_TOOLKIT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7007 if (popup_activated ())
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7008 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7009 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7010
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7011 /* I don't think this happens but let's be paranoid. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7012 if (redisplaying_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7013 return;
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7014
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7015 /* Record a function that resets redisplaying_p to its old value
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7016 when we leave this function. */
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7017 count = specpdl_ptr - specpdl;
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7018 record_unwind_protect (unwind_redisplay, make_number (redisplaying_p));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7019 ++redisplaying_p;
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7020
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7021 retry:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7022
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7023 reconsider_clip_changes (w, current_buffer);
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7024
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7025 /* If new fonts have been loaded that make a glyph matrix adjustment
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7026 necessary, do it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7027 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7028 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7029 adjust_glyphs (NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7030 ++windows_or_buffers_changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7031 fonts_changed_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7032 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7033
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7034 if (! FRAME_WINDOW_P (sf)
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7035 && previous_terminal_frame != sf)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7036 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7037 /* Since frames on an ASCII terminal share the same display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7038 area, displaying a different frame means redisplay the whole
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7039 thing. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7040 windows_or_buffers_changed++;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7041 SET_FRAME_GARBAGED (sf);
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7042 XSETFRAME (Vterminal_frame, sf);
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7043 }
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7044 previous_terminal_frame = sf;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7045
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7046 /* Set the visible flags for all frames. Do this before checking
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7047 for resized or garbaged frames; they want to know if their frames
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7048 are visible. See the comment in frame.h for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7049 FRAME_SAMPLE_VISIBILITY. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7050 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7051 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7052
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7053 number_of_visible_frames = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7054
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7055 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7056 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7057 struct frame *f = XFRAME (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7058
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7059 FRAME_SAMPLE_VISIBILITY (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7060 if (FRAME_VISIBLE_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7061 ++number_of_visible_frames;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7062 clear_desired_matrices (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7063 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7064 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7065
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7066 /* Notice any pending interrupt request to change frame size. */
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7067 do_pending_window_change (1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7068
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7069 /* Clear frames marked as garbaged. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7070 if (frame_garbaged)
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7071 clear_garbaged_frames ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7072
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7073 /* Build menubar and tool-bar items. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7074 prepare_menu_bars ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7075
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7076 if (windows_or_buffers_changed)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7077 update_mode_lines++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7078
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7079 /* Detect case that we need to write or remove a star in the mode line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7080 if ((SAVE_MODIFF < MODIFF) != !NILP (w->last_had_star))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7081 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7082 w->update_mode_line = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7083 if (buffer_shared > 1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7084 update_mode_lines++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7085 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7086
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7087 /* If %c is in the mode line, update it if needed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7088 if (!NILP (w->column_number_displayed)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7089 /* This alternative quickly identifies a common case
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7090 where no change is needed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7091 && !(PT == XFASTINT (w->last_point)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7092 && XFASTINT (w->last_modified) >= MODIFF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7093 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7094 && XFASTINT (w->column_number_displayed) != current_column ())
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7095 w->update_mode_line = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7096
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7097 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7098
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7099 /* The variable buffer_shared is set in redisplay_window and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7100 indicates that we redisplay a buffer in different windows. See
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7101 there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7102 consider_all_windows_p = update_mode_lines || buffer_shared > 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7103
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7104 /* If specs for an arrow have changed, do thorough redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7105 to ensure we remove any arrow that should no longer exist. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7106 if (! EQ (COERCE_MARKER (Voverlay_arrow_position), last_arrow_position)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7107 || ! EQ (Voverlay_arrow_string, last_arrow_string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7108 consider_all_windows_p = windows_or_buffers_changed = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7109
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7110 /* Normally the message* functions will have already displayed and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7111 updated the echo area, but the frame may have been trashed, or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7112 the update may have been preempted, so display the echo area
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7113 again here. Checking both message buffers captures the case that
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7114 the echo area should be cleared. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7115 if (!NILP (echo_area_buffer[0]) || !NILP (echo_area_buffer[1]))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7116 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7117 int window_height_changed_p = echo_area_display (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7118 must_finish = 1;
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
7119
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7120 if (fonts_changed_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7121 goto retry;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7122 else if (window_height_changed_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7123 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7124 consider_all_windows_p = 1;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7125 ++update_mode_lines;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7126 ++windows_or_buffers_changed;
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7127
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7128 /* If window configuration was changed, frames may have been
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7129 marked garbaged. Clear them or we will experience
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7130 surprises wrt scrolling. */
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7131 if (frame_garbaged)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7132 clear_garbaged_frames ();
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7133 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7134 }
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
7135 else if (w == XWINDOW (minibuf_window)
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
7136 && (current_buffer->clip_changed
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
7137 || XFASTINT (w->last_modified) < MODIFF
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
7138 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF)
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7139 && resize_mini_window (w, 0))
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7140 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7141 /* Resized active mini-window to fit the size of what it is
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
7142 showing if its contents might have changed. */
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
7143 must_finish = 1;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
7144 consider_all_windows_p = 1;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7145 ++windows_or_buffers_changed;
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
7146 ++update_mode_lines;
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7147
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7148 /* If window configuration was changed, frames may have been
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7149 marked garbaged. Clear them or we will experience
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7150 surprises wrt scrolling. */
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7151 if (frame_garbaged)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7152 clear_garbaged_frames ();
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7153 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7154
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7155
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7156 /* If showing the region, and mark has changed, we must redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7157 the whole window. The assignment to this_line_start_pos prevents
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7158 the optimization directly below this if-statement. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7159 if (((!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7160 && !NILP (XBUFFER (w->buffer)->mark_active))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7161 != !NILP (w->region_showing))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7162 || (!NILP (w->region_showing)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7163 && !EQ (w->region_showing,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7164 Fmarker_position (XBUFFER (w->buffer)->mark))))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7165 CHARPOS (this_line_start_pos) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7166
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7167 /* Optimize the case that only the line containing the cursor in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7168 selected window has changed. Variables starting with this_ are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7169 set in display_line and record information about the line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7170 containing the cursor. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7171 tlbufpos = this_line_start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7172 tlendpos = this_line_end_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7173 if (!consider_all_windows_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7174 && CHARPOS (tlbufpos) > 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7175 && NILP (w->update_mode_line)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7176 && !current_buffer->clip_changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7177 && FRAME_VISIBLE_P (XFRAME (w->frame))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7178 && !FRAME_OBSCURED_P (XFRAME (w->frame))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7179 /* Make sure recorded data applies to current buffer, etc. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7180 && this_line_buffer == current_buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7181 && current_buffer == XBUFFER (w->buffer)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7182 && NILP (w->force_start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7183 /* Point must be on the line that we have info recorded about. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7184 && PT >= CHARPOS (tlbufpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7185 && PT <= Z - CHARPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7186 /* All text outside that line, including its final newline,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7187 must be unchanged */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7188 && text_outside_line_unchanged_p (w, CHARPOS (tlbufpos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7189 CHARPOS (tlendpos)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7190 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7191 if (CHARPOS (tlbufpos) > BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7192 && FETCH_BYTE (BYTEPOS (tlbufpos) - 1) != '\n'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7193 && (CHARPOS (tlbufpos) == ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7194 || FETCH_BYTE (BYTEPOS (tlbufpos)) == '\n'))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7195 /* Former continuation line has disappeared by becoming empty */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7196 goto cancel;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7197 else if (XFASTINT (w->last_modified) < MODIFF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7198 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7199 || MINI_WINDOW_P (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7200 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7201 /* We have to handle the case of continuation around a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7202 wide-column character (See the comment in indent.c around
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7203 line 885).
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7204
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7205 For instance, in the following case:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7206
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7207 -------- Insert --------
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7208 K_A_N_\\ `a' K_A_N_a\ `X_' are wide-column chars.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7209 J_I_ ==> J_I_ `^^' are cursors.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7210 ^^ ^^
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7211 -------- --------
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7212
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7213 As we have to redraw the line above, we should goto cancel. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7214
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7215 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7216 int line_height_before = this_line_pixel_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7217
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7218 /* Note that start_display will handle the case that the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7219 line starting at tlbufpos is a continuation lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7220 start_display (&it, w, tlbufpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7221
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7222 /* Implementation note: It this still necessary? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7223 if (it.current_x != this_line_start_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7224 goto cancel;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7225
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7226 TRACE ((stderr, "trying display optimization 1\n"));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7227 w->cursor.vpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7228 overlay_arrow_seen = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7229 it.vpos = this_line_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7230 it.current_y = this_line_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7231 it.glyph_row = MATRIX_ROW (w->desired_matrix, this_line_vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7232 display_line (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7233
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7234 /* If line contains point, is not continued,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7235 and ends at same distance from eob as before, we win */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7236 if (w->cursor.vpos >= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7237 /* Line is not continued, otherwise this_line_start_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7238 would have been set to 0 in display_line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7239 && CHARPOS (this_line_start_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7240 /* Line ends as before. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7241 && CHARPOS (this_line_end_pos) == CHARPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7242 /* Line has same height as before. Otherwise other lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7243 would have to be shifted up or down. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7244 && this_line_pixel_height == line_height_before)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7245 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7246 /* If this is not the window's last line, we must adjust
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7247 the charstarts of the lines below. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7248 if (it.current_y < it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7249 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7250 struct glyph_row *row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7251 = MATRIX_ROW (w->current_matrix, this_line_vpos + 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7252 int delta, delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7253
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7254 if (Z - CHARPOS (tlendpos) == ZV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7255 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7256 /* This line ends at end of (accessible part of)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7257 buffer. There is no newline to count. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7258 delta = (Z
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7259 - CHARPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7260 - MATRIX_ROW_START_CHARPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7261 delta_bytes = (Z_BYTE
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7262 - BYTEPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7263 - MATRIX_ROW_START_BYTEPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7264 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7265 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7266 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7267 /* This line ends in a newline. Must take
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7268 account of the newline and the rest of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7269 text that follows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7270 delta = (Z
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7271 - CHARPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7272 - MATRIX_ROW_START_CHARPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7273 delta_bytes = (Z_BYTE
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7274 - BYTEPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7275 - MATRIX_ROW_START_BYTEPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7276 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7277
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7278 increment_glyph_matrix_buffer_positions (w->current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7279 this_line_vpos + 1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7280 w->current_matrix->nrows,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7281 delta, delta_bytes);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7282 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7283
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7284 /* If this row displays text now but previously didn't,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7285 or vice versa, w->window_end_vpos may have to be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7286 adjusted. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7287 if ((it.glyph_row - 1)->displays_text_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7288 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7289 if (XFASTINT (w->window_end_vpos) < this_line_vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7290 XSETINT (w->window_end_vpos, this_line_vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7291 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7292 else if (XFASTINT (w->window_end_vpos) == this_line_vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7293 && this_line_vpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7294 XSETINT (w->window_end_vpos, this_line_vpos - 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7295 w->window_end_valid = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7296
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7297 /* Update hint: No need to try to scroll in update_window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7298 w->desired_matrix->no_scrolling_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7299
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7300 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7301 *w->desired_matrix->method = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7302 debug_method_add (w, "optimization 1");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7303 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7304 goto update;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7305 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7306 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7307 goto cancel;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7308 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7309 else if (/* Cursor position hasn't changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7310 PT == XFASTINT (w->last_point)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7311 /* Make sure the cursor was last displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7312 in this window. Otherwise we have to reposition it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7313 && 0 <= w->cursor.vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7314 && XINT (w->height) > w->cursor.vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7315 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7316 if (!must_finish)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7317 {
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7318 do_pending_window_change (1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7319
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7320 /* We used to always goto end_of_redisplay here, but this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7321 isn't enough if we have a blinking cursor. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7322 if (w->cursor_off_p == w->last_cursor_off_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7323 goto end_of_redisplay;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7324 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7325 goto update;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7326 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7327 /* If highlighting the region, or if the cursor is in the echo area,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7328 then we can't just move the cursor. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7329 else if (! (!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7330 && !NILP (current_buffer->mark_active))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7331 && (w == XWINDOW (current_buffer->last_selected_window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7332 || highlight_nonselected_windows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7333 && NILP (w->region_showing)
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
7334 && NILP (Vshow_trailing_whitespace)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7335 && !cursor_in_echo_area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7336 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7337 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7338 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7339
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7340 /* Skip from tlbufpos to PT and see where it is. Note that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7341 PT may be in invisible text. If so, we will end at the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7342 next visible position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7343 init_iterator (&it, w, CHARPOS (tlbufpos), BYTEPOS (tlbufpos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7344 NULL, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7345 it.current_x = this_line_start_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7346 it.current_y = this_line_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7347 it.vpos = this_line_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7348
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7349 /* The call to move_it_to stops in front of PT, but
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7350 moves over before-strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7351 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7352
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7353 if (it.vpos == this_line_vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7354 && (row = MATRIX_ROW (w->current_matrix, this_line_vpos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7355 row->enabled_p))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7356 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7357 xassert (this_line_vpos == it.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7358 xassert (this_line_y == it.current_y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7359 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7360 goto update;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7361 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7362 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7363 goto cancel;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7364 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7365
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7366 cancel:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7367 /* Text changed drastically or point moved off of line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7368 SET_MATRIX_ROW_ENABLED_P (w->desired_matrix, this_line_vpos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7369 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7370
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7371 CHARPOS (this_line_start_pos) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7372 consider_all_windows_p |= buffer_shared > 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7373 ++clear_face_cache_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7374
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7375
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7376 /* Build desired matrices. If consider_all_windows_p is non-zero,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7377 do it for all windows on all frames. Otherwise do it for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7378 selected_window, only. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7379
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7380 if (consider_all_windows_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7381 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7382 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7383
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7384 /* Clear the face cache eventually. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7385 if (clear_face_cache_count > CLEAR_FACE_CACHE_COUNT)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7386 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7387 clear_face_cache (0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7388 clear_face_cache_count = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7389 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7390
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7391 /* Recompute # windows showing selected buffer. This will be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7392 incremented each time such a window is displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7393 buffer_shared = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7394
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7395 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7396 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7397 struct frame *f = XFRAME (frame);
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7398 if (FRAME_WINDOW_P (f) || f == sf)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7399 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7400 /* Mark all the scroll bars to be removed; we'll redeem
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7401 the ones we want when we redisplay their windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7402 if (condemn_scroll_bars_hook)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7403 (*condemn_scroll_bars_hook) (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7404
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7405 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7406 redisplay_windows (FRAME_ROOT_WINDOW (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7407
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7408 /* Any scroll bars which redisplay_windows should have
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7409 nuked should now go away. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7410 if (judge_scroll_bars_hook)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7411 (*judge_scroll_bars_hook) (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7412 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7413 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7414 }
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7415 else if (FRAME_VISIBLE_P (sf)
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7416 && !FRAME_OBSCURED_P (sf))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7417 redisplay_window (selected_window, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7418
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7419
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7420 /* Compare desired and current matrices, perform output. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7421
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7422 update:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7423
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7424 /* If fonts changed, display again. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7425 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7426 goto retry;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7427
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7428 /* Prevent various kinds of signals during display update.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7429 stdio is not robust about handling signals,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7430 which can cause an apparent I/O error. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7431 if (interrupt_input)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7432 unrequest_sigio ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7433 stop_polling ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7434
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7435 if (consider_all_windows_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7436 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7437 Lisp_Object tail;
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7438 struct frame *f;
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7439 int hscrolled_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7440
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7441 pause = 0;
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7442 hscrolled_p = 0;
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7443
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7444 /* See if we have to hscroll. */
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7445 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7446 if (FRAMEP (XCAR (tail)))
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7447 {
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7448 f = XFRAME (XCAR (tail));
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7449
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7450 if ((FRAME_WINDOW_P (f)
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7451 || f == sf)
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7452 && FRAME_VISIBLE_P (f)
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7453 && !FRAME_OBSCURED_P (f)
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7454 && hscroll_windows (f->root_window))
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7455 hscrolled_p = 1;
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7456 }
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7457
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7458 if (hscrolled_p)
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7459 goto retry;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7460
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
7461 for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7462 {
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
7463 if (!FRAMEP (XCAR (tail)))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7464 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7465
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
7466 f = XFRAME (XCAR (tail));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7467
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7468 if ((FRAME_WINDOW_P (f) || f == sf)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7469 && FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7470 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7471 /* Mark all windows as to be updated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7472 set_window_update_flags (XWINDOW (f->root_window), 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7473 pause |= update_frame (f, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7474 if (!pause)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7475 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7476 mark_window_display_accurate (f->root_window, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7477 if (frame_up_to_date_hook != 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7478 (*frame_up_to_date_hook) (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7479 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7480 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7481 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7482 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7483 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7484 {
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7485 if (FRAME_VISIBLE_P (sf)
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7486 && !FRAME_OBSCURED_P (sf))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7487 {
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7488 if (hscroll_windows (selected_window))
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7489 goto retry;
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7490
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7491 XWINDOW (selected_window)->must_be_updated_p = 1;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7492 pause = update_frame (sf, 0, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7493 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7494 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7495 pause = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7496
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7497 /* We may have called echo_area_display at the top of this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7498 function. If the echo area is on another frame, that may
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7499 have put text on a frame other than the selected one, so the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7500 above call to update_frame would not have caught it. Catch
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7501 it here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7502 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7503 Lisp_Object mini_window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7504 struct frame *mini_frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7505
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7506 mini_window = FRAME_MINIBUF_WINDOW (sf);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7507 mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7508
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7509 if (mini_frame != sf && FRAME_WINDOW_P (mini_frame))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7510 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7511 XWINDOW (mini_window)->must_be_updated_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7512 pause |= update_frame (mini_frame, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7513 if (!pause && hscroll_windows (mini_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7514 goto retry;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7515 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7516 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7517 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7518
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7519 /* If display was paused because of pending input, make sure we do a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7520 thorough update the next time. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7521 if (pause)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7522 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7523 /* Prevent the optimization at the beginning of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7524 redisplay_internal that tries a single-line update of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7525 line containing the cursor in the selected window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7526 CHARPOS (this_line_start_pos) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7527
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7528 /* Let the overlay arrow be updated the next time. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7529 if (!NILP (last_arrow_position))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7530 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7531 last_arrow_position = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7532 last_arrow_string = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7533 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7534
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7535 /* If we pause after scrolling, some rows in the current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7536 matrices of some windows are not valid. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7537 if (!WINDOW_FULL_WIDTH_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7538 && !FRAME_WINDOW_P (XFRAME (w->frame)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7539 update_mode_lines = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7540 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7541
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7542 /* Now text on frame agrees with windows, so put info into the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7543 windows for partial redisplay to follow. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7544 if (!pause)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7545 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7546 register struct buffer *b = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7547
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7548 BUF_UNCHANGED_MODIFIED (b) = BUF_MODIFF (b);
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7549 BUF_OVERLAY_UNCHANGED_MODIFIED (b) = BUF_OVERLAY_MODIFF (b);
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7550 BUF_BEG_UNCHANGED (b) = BUF_GPT (b) - BUF_BEG (b);
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7551 BUF_END_UNCHANGED (b) = BUF_Z (b) - BUF_GPT (b);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7552
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7553 if (consider_all_windows_p)
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7554 mark_window_display_accurate (FRAME_ROOT_WINDOW (sf), 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7555 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7556 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7557 XSETFASTINT (w->last_point, BUF_PT (b));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7558 w->last_cursor = w->cursor;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7559 w->last_cursor_off_p = w->cursor_off_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7560
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7561 b->clip_changed = 0;
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7562 b->prevent_redisplay_optimizations_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7563 w->update_mode_line = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7564 XSETFASTINT (w->last_modified, BUF_MODIFF (b));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7565 XSETFASTINT (w->last_overlay_modified, BUF_OVERLAY_MODIFF (b));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7566 w->last_had_star
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7567 = (BUF_MODIFF (XBUFFER (w->buffer)) > BUF_SAVE_MODIFF (XBUFFER (w->buffer))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7568 ? Qt : Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7569
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7570 /* Record if we are showing a region, so can make sure to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7571 update it fully at next redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7572 w->region_showing = (!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7573 && (w == XWINDOW (current_buffer->last_selected_window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7574 || highlight_nonselected_windows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7575 && !NILP (XBUFFER (w->buffer)->mark_active)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7576 ? Fmarker_position (XBUFFER (w->buffer)->mark)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7577 : Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7578
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7579 w->window_end_valid = w->buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7580 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7581 last_arrow_string = Voverlay_arrow_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7582 if (frame_up_to_date_hook != 0)
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7583 (*frame_up_to_date_hook) (sf);
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7584
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7585 w->current_matrix->buffer = b;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7586 w->current_matrix->begv = BUF_BEGV (b);
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7587 w->current_matrix->zv = BUF_ZV (b);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7588 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7589
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7590 update_mode_lines = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7591 windows_or_buffers_changed = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7592 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7593
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7594 /* Start SIGIO interrupts coming again. Having them off during the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7595 code above makes it less likely one will discard output, but not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7596 impossible, since there might be stuff in the system buffer here.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7597 But it is much hairier to try to do anything about that. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7598 if (interrupt_input)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7599 request_sigio ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7600 start_polling ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7601
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7602 /* If a frame has become visible which was not before, redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7603 again, so that we display it. Expose events for such a frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7604 (which it gets when becoming visible) don't call the parts of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7605 redisplay constructing glyphs, so simply exposing a frame won't
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7606 display anything in this case. So, we have to display these
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7607 frames here explicitly. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7608 if (!pause)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7609 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7610 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7611 int new_count = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7612
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7613 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7614 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7615 int this_is_visible = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7616
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7617 if (XFRAME (frame)->visible)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7618 this_is_visible = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7619 FRAME_SAMPLE_VISIBILITY (XFRAME (frame));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7620 if (XFRAME (frame)->visible)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7621 this_is_visible = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7622
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7623 if (this_is_visible)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7624 new_count++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7625 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7626
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7627 if (new_count != number_of_visible_frames)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7628 windows_or_buffers_changed++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7629 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7630
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7631 /* Change frame size now if a change is pending. */
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7632 do_pending_window_change (1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7633
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7634 /* If we just did a pending size change, or have additional
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7635 visible frames, redisplay again. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7636 if (windows_or_buffers_changed && !pause)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7637 goto retry;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7638
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7639 end_of_redisplay:;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7640
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7641 unbind_to (count, Qnil);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7642 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7643
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7644
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7645 /* Redisplay, but leave alone any recent echo area message unless
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7646 another message has been requested in its place.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7647
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7648 This is useful in situations where you need to redisplay but no
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7649 user action has occurred, making it inappropriate for the message
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7650 area to be cleared. See tracking_off and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7651 wait_reading_process_input for examples of these situations. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7652
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7653 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7654 redisplay_preserve_echo_area ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7655 {
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7656 if (!NILP (echo_area_buffer[1]))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7657 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7658 /* We have a previously displayed message, but no current
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7659 message. Redisplay the previous message. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7660 display_last_displayed_message_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7661 redisplay_internal (1);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7662 display_last_displayed_message_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7663 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7664 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7665 redisplay_internal (1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7666 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7667
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7668
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7669 /* Function registered with record_unwind_protect in
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7670 redisplay_internal. Clears the flag indicating that a redisplay is
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7671 in progress. */
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7672
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7673 static Lisp_Object
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7674 unwind_redisplay (old_redisplaying_p)
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7675 Lisp_Object old_redisplaying_p;
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7676 {
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7677 redisplaying_p = XFASTINT (old_redisplaying_p);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7678 return Qnil;
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7679 }
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7680
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7681
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7682 /* Mark the display of windows in the window tree rooted at WINDOW as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7683 accurate or inaccurate. If FLAG is non-zero mark display of WINDOW
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7684 as accurate. If FLAG is zero arrange for WINDOW to be redisplayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7685 the next time redisplay_internal is called. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7686
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7687 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7688 mark_window_display_accurate (window, accurate_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7689 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7690 int accurate_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7691 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7692 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7693
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7694 for (; !NILP (window); window = w->next)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7695 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7696 w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7697
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7698 if (BUFFERP (w->buffer))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7699 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7700 struct buffer *b = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7701
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7702 XSETFASTINT (w->last_modified,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7703 accurate_p ? BUF_MODIFF (b) : 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7704 XSETFASTINT (w->last_overlay_modified,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7705 accurate_p ? BUF_OVERLAY_MODIFF (b) : 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7706 w->last_had_star = (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7707 ? Qt : Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7708
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7709 #if 0 /* I don't think this is necessary because display_line does it.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7710 Let's check it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7711 /* Record if we are showing a region, so can make sure to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7712 update it fully at next redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7713 w->region_showing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7714 = (!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7715 && (w == XWINDOW (current_buffer->last_selected_window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7716 || highlight_nonselected_windows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7717 && (!NILP (b->mark_active)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7718 ? Fmarker_position (b->mark)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7719 : Qnil));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7720 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7721
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7722 if (accurate_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7723 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7724 b->clip_changed = 0;
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7725 b->prevent_redisplay_optimizations_p = 0;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7726 w->current_matrix->buffer = b;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7727 w->current_matrix->begv = BUF_BEGV (b);
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7728 w->current_matrix->zv = BUF_ZV (b);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7729 w->last_cursor = w->cursor;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7730 w->last_cursor_off_p = w->cursor_off_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7731 if (w == XWINDOW (selected_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7732 w->last_point = BUF_PT (b);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7733 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7734 w->last_point = XMARKER (w->pointm)->charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7735 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7736 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7737
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7738 w->window_end_valid = w->buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7739 w->update_mode_line = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7740
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7741 if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7742 mark_window_display_accurate (w->vchild, accurate_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7743 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7744 mark_window_display_accurate (w->hchild, accurate_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7745 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7746
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7747 if (accurate_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7748 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7749 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7750 last_arrow_string = Voverlay_arrow_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7751 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7752 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7753 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7754 /* Force a thorough redisplay the next time by setting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7755 last_arrow_position and last_arrow_string to t, which is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7756 unequal to any useful value of Voverlay_arrow_... */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7757 last_arrow_position = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7758 last_arrow_string = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7759 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7760 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7761
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7762
17317
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7763 /* Return value in display table DP (Lisp_Char_Table *) for character
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7764 C. Since a display table doesn't have any parent, we don't have to
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7765 follow parent. Do not call this function directly but use the
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7766 macro DISP_CHAR_VECTOR. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7767
17317
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7768 Lisp_Object
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7769 disp_char_vector (dp, c)
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7770 struct Lisp_Char_Table *dp;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7771 int c;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7772 {
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7773 int code[4], i;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7774 Lisp_Object val;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7775
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7776 if (SINGLE_BYTE_CHAR_P (c))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7777 return (dp->contents[c]);
17317
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7778
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7779 SPLIT_NON_ASCII_CHAR (c, code[0], code[1], code[2]);
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7780 if (code[0] != CHARSET_COMPOSITION)
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7781 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7782 if (code[1] < 32)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7783 code[1] = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7784 else if (code[2] < 32)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7785 code[2] = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7786 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7787
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7788 /* Here, the possible range of code[0] (== charset ID) is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7789 128..max_charset. Since the top level char table contains data
17317
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7790 for multibyte characters after 256th element, we must increment
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7791 code[0] by 128 to get a correct index. */
17317
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7792 code[0] += 128;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7793 code[3] = -1; /* anchor */
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7794
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7795 for (i = 0; code[i] >= 0; i++, dp = XCHAR_TABLE (val))
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7796 {
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7797 val = dp->contents[code[i]];
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7798 if (!SUB_CHAR_TABLE_P (val))
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7799 return (NILP (val) ? dp->defalt : val);
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7800 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7801
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7802 /* Here, val is a sub char table. We return the default value of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7803 it. */
17317
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7804 return (dp->defalt);
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7805 }
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
7806
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7807
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7808
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7809 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7810 Window Redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7811 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7812
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7813 /* Redisplay all leaf windows in the window tree rooted at WINDOW. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7814
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7815 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7816 redisplay_windows (window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7817 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7818 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7819 while (!NILP (window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7820 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7821 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7822
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7823 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7824 redisplay_windows (w->hchild);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7825 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7826 redisplay_windows (w->vchild);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7827 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7828 redisplay_window (window, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7829
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7830 window = w->next;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7831 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7832 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7833
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7834
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7835 /* Set cursor position of W. PT is assumed to be displayed in ROW.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7836 DELTA is the number of bytes by which positions recorded in ROW
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7837 differ from current buffer positions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7838
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7839 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7840 set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7841 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7842 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7843 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7844 int delta, delta_bytes, dy, dvpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7845 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7846 struct glyph *glyph = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7847 struct glyph *end = glyph + row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7848 int x = row->x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7849 int pt_old = PT - delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7850
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7851 /* Skip over glyphs not having an object at the start of the row.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7852 These are special glyphs like truncation marks on terminal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7853 frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7854 if (row->displays_text_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7855 while (glyph < end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7856 && !glyph->object
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7857 && glyph->charpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7858 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7859 x += glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7860 ++glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7861 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7862
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7863 while (glyph < end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7864 && glyph->object
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7865 && (!BUFFERP (glyph->object)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7866 || glyph->charpos < pt_old))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7867 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7868 x += glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7869 ++glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7870 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7871
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7872 w->cursor.hpos = glyph - row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7873 w->cursor.x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7874 w->cursor.vpos = MATRIX_ROW_VPOS (row, matrix) + dvpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7875 w->cursor.y = row->y + dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7876
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7877 if (w == XWINDOW (selected_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7878 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7879 if (!row->continued_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7880 && !MATRIX_ROW_CONTINUATION_LINE_P (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7881 && row->x == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7882 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7883 this_line_buffer = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7884
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7885 CHARPOS (this_line_start_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7886 = MATRIX_ROW_START_CHARPOS (row) + delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7887 BYTEPOS (this_line_start_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7888 = MATRIX_ROW_START_BYTEPOS (row) + delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7889
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7890 CHARPOS (this_line_end_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7891 = Z - (MATRIX_ROW_END_CHARPOS (row) + delta);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7892 BYTEPOS (this_line_end_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7893 = Z_BYTE - (MATRIX_ROW_END_BYTEPOS (row) + delta_bytes);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7894
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7895 this_line_y = w->cursor.y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7896 this_line_pixel_height = row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7897 this_line_vpos = w->cursor.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7898 this_line_start_x = row->x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7899 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7900 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7901 CHARPOS (this_line_start_pos) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7902 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7903 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7904
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7905
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7906 /* Run window scroll functions, if any, for WINDOW with new window
25643
385bf7dbf253 (run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents: 25614
diff changeset
7907 start STARTP. Sets the window start of WINDOW to that position.
385bf7dbf253 (run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents: 25614
diff changeset
7908
385bf7dbf253 (run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents: 25614
diff changeset
7909 We assume that the window's buffer is really current. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7910
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7911 static INLINE struct text_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7912 run_window_scroll_functions (window, startp)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7913 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7914 struct text_pos startp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7915 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7916 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7917 SET_MARKER_FROM_TEXT_POS (w->start, startp);
25643
385bf7dbf253 (run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents: 25614
diff changeset
7918
385bf7dbf253 (run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents: 25614
diff changeset
7919 if (current_buffer != XBUFFER (w->buffer))
385bf7dbf253 (run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents: 25614
diff changeset
7920 abort ();
385bf7dbf253 (run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents: 25614
diff changeset
7921
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7922 if (!NILP (Vwindow_scroll_functions))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7923 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7924 run_hook_with_args_2 (Qwindow_scroll_functions, window,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7925 make_number (CHARPOS (startp)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7926 SET_TEXT_POS_FROM_MARKER (startp, w->start);
25643
385bf7dbf253 (run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents: 25614
diff changeset
7927 /* In case the hook functions switch buffers. */
385bf7dbf253 (run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents: 25614
diff changeset
7928 if (current_buffer != XBUFFER (w->buffer))
385bf7dbf253 (run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents: 25614
diff changeset
7929 set_buffer_internal_1 (XBUFFER (w->buffer));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7930 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7931
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7932 return startp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7933 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7934
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7935
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7936 /* Modify the desired matrix of window W and W->vscroll so that the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7937 line containing the cursor is fully visible. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
7938
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7939 static void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7940 make_cursor_line_fully_visible (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7941 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7942 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7943 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7944 struct glyph_row *row;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
7945 int header_line_height;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7946
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7947 /* It's not always possible to find the cursor, e.g, when a window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7948 is full of overlay strings. Don't do anything in that case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7949 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7950 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7951
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7952 matrix = w->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7953 row = MATRIX_ROW (matrix, w->cursor.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7954
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7955 /* If row->y == top y of window display area, the window isn't tall
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7956 enough to display a single line. There is nothing we can do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7957 about it. */
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
7958 header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
7959 if (row->y == header_line_height)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7960 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7961
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7962 if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (w, row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7963 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7964 int dy = row->height - row->visible_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7965 w->vscroll = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7966 w->cursor.y += dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7967 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7968 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7969 else if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7970 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7971 int dy = - (row->height - row->visible_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7972 w->vscroll = dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7973 w->cursor.y += dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7974 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7975 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7976
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7977 /* When we change the cursor y-position of the selected window,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7978 change this_line_y as well so that the display optimization for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7979 the cursor line of the selected window in redisplay_internal uses
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7980 the correct y-position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7981 if (w == XWINDOW (selected_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7982 this_line_y = w->cursor.y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7983 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7984
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7985
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7986 /* Try scrolling PT into view in window WINDOW. JUST_THIS_ONE_P
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7987 non-zero means only WINDOW is redisplayed in redisplay_internal.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7988 TEMP_SCROLL_STEP has the same meaning as scroll_step, and is used
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7989 in redisplay_window to bring a partially visible line into view in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7990 the case that only the cursor has moved.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7991
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7992 Value is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7993
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7994 1 if scrolling succeeded
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7995
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7996 0 if scrolling didn't find point.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7997
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7998 -1 if new fonts have been loaded so that we must interrupt
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7999 redisplay, adjust glyph matrices, and try again. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8000
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8001 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8002 try_scrolling (window, just_this_one_p, scroll_conservatively,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8003 scroll_step, temp_scroll_step)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8004 Lisp_Object window;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8005 int just_this_one_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8006 int scroll_conservatively, scroll_step;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8007 int temp_scroll_step;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8008 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8009 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8010 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8011 struct text_pos scroll_margin_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8012 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8013 struct text_pos startp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8014 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8015 Lisp_Object window_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8016 int this_scroll_margin;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8017 int dy = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8018 int scroll_max;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8019 int line_height, rc;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8020 int amount_to_scroll = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8021 Lisp_Object aggressive;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8022 int height;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8023
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8024 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8025 debug_method_add (w, "try_scrolling");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8026 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8027
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8028 SET_TEXT_POS_FROM_MARKER (startp, w->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8029
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8030 /* Compute scroll margin height in pixels. We scroll when point is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8031 within this distance from the top or bottom of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8032 if (scroll_margin > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8033 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8034 this_scroll_margin = min (scroll_margin, XINT (w->height) / 4);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8035 this_scroll_margin *= CANON_Y_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8036 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8037 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8038 this_scroll_margin = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8039
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8040 /* Compute how much we should try to scroll maximally to bring point
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8041 into view. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8042 if (scroll_step)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8043 scroll_max = scroll_step;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8044 else if (scroll_conservatively)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8045 scroll_max = scroll_conservatively;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8046 else if (temp_scroll_step)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8047 scroll_max = temp_scroll_step;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8048 else if (NUMBERP (current_buffer->scroll_down_aggressively)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8049 || NUMBERP (current_buffer->scroll_up_aggressively))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8050 /* We're trying to scroll because of aggressive scrolling
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8051 but no scroll_step is set. Choose an arbitrary one. Maybe
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8052 there should be a variable for this. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8053 scroll_max = 10;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8054 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8055 scroll_max = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8056 scroll_max *= CANON_Y_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8057
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8058 /* Decide whether we have to scroll down. Start at the window end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8059 and move this_scroll_margin up to find the position of the scroll
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8060 margin. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8061 window_end = Fwindow_end (window, Qt);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8062 CHARPOS (scroll_margin_pos) = XINT (window_end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8063 BYTEPOS (scroll_margin_pos) = CHAR_TO_BYTE (CHARPOS (scroll_margin_pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8064 if (this_scroll_margin)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8065 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8066 start_display (&it, w, scroll_margin_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8067 move_it_vertically (&it, - this_scroll_margin);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8068 scroll_margin_pos = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8069 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8070
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8071 if (PT >= CHARPOS (scroll_margin_pos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8072 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8073 int y0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8074
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8075 /* Point is in the scroll margin at the bottom of the window, or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8076 below. Compute a new window start that makes point visible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8077
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8078 /* Compute the distance from the scroll margin to PT.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8079 Give up if the distance is greater than scroll_max. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8080 start_display (&it, w, scroll_margin_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8081 y0 = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8082 move_it_to (&it, PT, 0, it.last_visible_y, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8083 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8084 line_height = (it.max_ascent + it.max_descent
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8085 ? it.max_ascent + it.max_descent
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8086 : last_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8087 dy = it.current_y + line_height - y0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8088 if (dy > scroll_max)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8089 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8090
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8091 /* Move the window start down. If scrolling conservatively,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8092 move it just enough down to make point visible. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8093 scroll_step is set, move it down by scroll_step. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8094 start_display (&it, w, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8095
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8096 if (scroll_conservatively)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8097 amount_to_scroll = dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8098 else if (scroll_step || temp_scroll_step)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8099 amount_to_scroll = scroll_max;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8100 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8101 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8102 aggressive = current_buffer->scroll_down_aggressively;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8103 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w)
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
8104 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8105 if (NUMBERP (aggressive))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8106 amount_to_scroll = XFLOATINT (aggressive) * height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8107 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8108
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8109 if (amount_to_scroll <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8110 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8111
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8112 move_it_vertically (&it, amount_to_scroll);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8113 startp = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8114 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8115 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8116 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8117 /* See if point is inside the scroll margin at the top of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8118 window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8119 scroll_margin_pos = startp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8120 if (this_scroll_margin)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8121 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8122 start_display (&it, w, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8123 move_it_vertically (&it, this_scroll_margin);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8124 scroll_margin_pos = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8125 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8126
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8127 if (PT < CHARPOS (scroll_margin_pos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8128 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8129 /* Point is in the scroll margin at the top of the window or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8130 above what is displayed in the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8131 int y0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8132
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8133 /* Compute the vertical distance from PT to the scroll
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8134 margin position. Give up if distance is greater than
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8135 scroll_max. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8136 SET_TEXT_POS (pos, PT, PT_BYTE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8137 start_display (&it, w, pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8138 y0 = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8139 move_it_to (&it, CHARPOS (scroll_margin_pos), 0,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8140 it.last_visible_y, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8141 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8142 dy = it.current_y - y0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8143 if (dy > scroll_max)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8144 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8145
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8146 /* Compute new window start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8147 start_display (&it, w, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8148
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8149 if (scroll_conservatively)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8150 amount_to_scroll = dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8151 else if (scroll_step || temp_scroll_step)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8152 amount_to_scroll = scroll_max;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8153 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8154 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8155 aggressive = current_buffer->scroll_up_aggressively;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8156 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w)
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
8157 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8158 if (NUMBERP (aggressive))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8159 amount_to_scroll = XFLOATINT (aggressive) * height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8160 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8161
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8162 if (amount_to_scroll <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8163 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8164
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8165 move_it_vertically (&it, - amount_to_scroll);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8166 startp = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8167 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8168 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8169
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8170 /* Run window scroll functions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8171 startp = run_window_scroll_functions (window, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8172
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8173 /* Display the window. Give up if new fonts are loaded, or if point
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8174 doesn't appear. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8175 if (!try_window (window, startp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8176 rc = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8177 else if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8178 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8179 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8180 rc = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8181 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8182 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8183 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8184 /* Maybe forget recorded base line for line number display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8185 if (!just_this_one_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8186 || current_buffer->clip_changed
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8187 || BEG_UNCHANGED < CHARPOS (startp))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8188 w->base_line_number = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8189
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8190 /* If cursor ends up on a partially visible line, shift display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8191 lines up or down. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8192 make_cursor_line_fully_visible (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8193 rc = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8194 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8195
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8196 return rc;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8197 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8198
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8199
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8200 /* Compute a suitable window start for window W if display of W starts
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8201 on a continuation line. Value is non-zero if a new window start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8202 was computed.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8203
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8204 The new window start will be computed, based on W's width, starting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8205 from the start of the continued line. It is the start of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8206 screen line with the minimum distance from the old start W->start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8207
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8208 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8209 compute_window_start_on_continuation_line (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8210 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8211 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8212 struct text_pos pos, start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8213 int window_start_changed_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8214
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8215 SET_TEXT_POS_FROM_MARKER (start_pos, w->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8216
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8217 /* If window start is on a continuation line... Window start may be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8218 < BEGV in case there's invisible text at the start of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8219 buffer (M-x rmail, for example). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8220 if (CHARPOS (start_pos) > BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8221 && FETCH_BYTE (BYTEPOS (start_pos) - 1) != '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8222 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8223 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8224 struct glyph_row *row;
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
8225
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
8226 /* Handle the case that the window start is out of range. */
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
8227 if (CHARPOS (start_pos) < BEGV)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
8228 SET_TEXT_POS (start_pos, BEGV, BEGV_BYTE);
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
8229 else if (CHARPOS (start_pos) > ZV)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
8230 SET_TEXT_POS (start_pos, ZV, ZV_BYTE);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8231
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8232 /* Find the start of the continued line. This should be fast
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8233 because scan_buffer is fast (newline cache). */
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
8234 row = w->desired_matrix->rows + (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8235 init_iterator (&it, w, CHARPOS (start_pos), BYTEPOS (start_pos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8236 row, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8237 reseat_at_previous_visible_line_start (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8238
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8239 /* If the line start is "too far" away from the window start,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8240 say it takes too much time to compute a new window start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8241 if (CHARPOS (start_pos) - IT_CHARPOS (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8242 < XFASTINT (w->height) * XFASTINT (w->width))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8243 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8244 int min_distance, distance;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8245
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8246 /* Move forward by display lines to find the new window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8247 start. If window width was enlarged, the new start can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8248 be expected to be > the old start. If window width was
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8249 decreased, the new window start will be < the old start.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8250 So, we're looking for the display line start with the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8251 minimum distance from the old window start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8252 pos = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8253 min_distance = INFINITY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8254 while ((distance = abs (CHARPOS (start_pos) - IT_CHARPOS (it))),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8255 distance < min_distance)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8256 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8257 min_distance = distance;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8258 pos = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8259 move_it_by_lines (&it, 1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8260 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8261
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8262 /* Set the window start there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8263 SET_MARKER_FROM_TEXT_POS (w->start, pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8264 window_start_changed_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8265 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8266 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8267
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8268 return window_start_changed_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8269 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8270
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8271
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8272 /* Redisplay leaf window WINDOW. JUST_THIS_ONE_P non-zero means only
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8273 selected_window is redisplayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8274
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8275 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8276 redisplay_window (window, just_this_one_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8277 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8278 int just_this_one_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8279 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8280 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8281 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8282 struct buffer *buffer = XBUFFER (w->buffer);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8283 struct buffer *old = current_buffer;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8284 struct text_pos lpoint, opoint, startp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8285 int update_mode_line;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8286 int tem;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8287 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8288 /* Record it now because it's overwritten. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8289 int current_matrix_up_to_date_p = 0;
21424
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
8290 int really_switched_buffer = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8291 int temp_scroll_step = 0;
21748
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
8292 int count = specpdl_ptr - specpdl;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8293
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8294 SET_TEXT_POS (lpoint, PT, PT_BYTE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8295 opoint = lpoint;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8296
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8297 /* W must be a leaf window here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8298 xassert (!NILP (w->buffer));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8299 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8300 *w->desired_matrix->method = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8301 #endif
21748
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
8302
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
8303 specbind (Qinhibit_point_motion_hooks, Qt);
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8304
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8305 reconsider_clip_changes (w, buffer);
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8306
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8307 /* Has the mode line to be updated? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8308 update_mode_line = (!NILP (w->update_mode_line)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8309 || update_mode_lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8310 || buffer->clip_changed);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
8311
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
8312 if (MINI_WINDOW_P (w))
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
8313 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8314 if (w == XWINDOW (echo_area_window)
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8315 && !NILP (echo_area_buffer[0]))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8316 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8317 if (update_mode_line)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8318 /* We may have to update a tty frame's menu bar or a
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
8319 tool-bar. Example `M-x C-h C-h C-g'. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8320 goto finish_menu_bars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8321 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8322 /* We've already displayed the echo area glyphs in this window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8323 goto finish_scroll_bars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8324 }
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
8325 else if (w != XWINDOW (minibuf_window))
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
8326 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8327 /* W is a mini-buffer window, but it's not the currently
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8328 active one, so clear it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8329 int yb = window_text_bottom_y (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8330 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8331 int y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8332
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8333 for (y = 0, row = w->desired_matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8334 y < yb;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8335 y += row->height, ++row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8336 blank_row (w, row, y);
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
8337 goto finish_scroll_bars;
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
8338 }
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
8339 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8340
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8341 /* Otherwise set up data on this window; select its buffer and point
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8342 value. */
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
8343 if (update_mode_line)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8344 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8345 /* Really select the buffer, for the sake of buffer-local
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8346 variables. */
21424
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
8347 set_buffer_internal_1 (XBUFFER (w->buffer));
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
8348 really_switched_buffer = 1;
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
8349 }
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
8350 else
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
8351 set_buffer_temp (XBUFFER (w->buffer));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8352 SET_TEXT_POS (opoint, PT, PT_BYTE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8353
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8354 current_matrix_up_to_date_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8355 = (!NILP (w->window_end_valid)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8356 && !current_buffer->clip_changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8357 && XFASTINT (w->last_modified) >= MODIFF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8358 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8359
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8360 /* When windows_or_buffers_changed is non-zero, we can't rely on
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8361 the window end being valid, so set it to nil there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8362 if (windows_or_buffers_changed)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8363 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8364 /* If window starts on a continuation line, maybe adjust the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8365 window start in case the window's width changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8366 if (XMARKER (w->start)->buffer == current_buffer)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8367 compute_window_start_on_continuation_line (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8368
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8369 w->window_end_valid = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8370 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8371
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8372 /* Some sanity checks. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8373 CHECK_WINDOW_END (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8374 if (Z == Z_BYTE && CHARPOS (opoint) != BYTEPOS (opoint))
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
8375 abort ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8376 if (BYTEPOS (opoint) < CHARPOS (opoint))
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
8377 abort ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8378
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
8379 /* If %c is in mode line, update it if needed. */
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
8380 if (!NILP (w->column_number_displayed)
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
8381 /* This alternative quickly identifies a common case
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
8382 where no change is needed. */
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
8383 && !(PT == XFASTINT (w->last_point)
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
8384 && XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
8385 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
8386 && XFASTINT (w->column_number_displayed) != current_column ())
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
8387 update_mode_line = 1;
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
8388
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8389 /* Count number of windows showing the selected buffer. An indirect
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8390 buffer counts as its base buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8391 if (!just_this_one_p)
10303
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
8392 {
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
8393 struct buffer *current_base, *window_base;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
8394 current_base = current_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
8395 window_base = XBUFFER (XWINDOW (selected_window)->buffer);
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
8396 if (current_base->base_buffer)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
8397 current_base = current_base->base_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
8398 if (window_base->base_buffer)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
8399 window_base = window_base->base_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
8400 if (current_base == window_base)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
8401 buffer_shared++;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
8402 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8403
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8404 /* Point refers normally to the selected window. For any other
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8405 window, set up appropriate value. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8406 if (!EQ (window, selected_window))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8407 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
8408 int new_pt = XMARKER (w->pointm)->charpos;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
8409 int new_pt_byte = marker_byte_position (w->pointm);
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
8410 if (new_pt < BEGV)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8411 {
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
8412 new_pt = BEGV;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
8413 new_pt_byte = BEGV_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
8414 set_marker_both (w->pointm, Qnil, BEGV, BEGV_BYTE);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8415 }
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
8416 else if (new_pt > (ZV - 1))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8417 {
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
8418 new_pt = ZV;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
8419 new_pt_byte = ZV_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
8420 set_marker_both (w->pointm, Qnil, ZV, ZV_BYTE);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8421 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8422
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
8423 /* We don't use SET_PT so that the point-motion hooks don't run. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
8424 TEMP_SET_PT_BOTH (new_pt, new_pt_byte);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8425 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8426
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
8427 /* If any of the character widths specified in the display table
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8428 have changed, invalidate the width run cache. It's true that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8429 this may be a bit late to catch such changes, but the rest of
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
8430 redisplay goes (non-fatally) haywire when the display table is
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
8431 changed, so why should we worry about doing any better? */
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
8432 if (current_buffer->width_run_cache)
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
8433 {
13188
dc0909e788bd (redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 13104
diff changeset
8434 struct Lisp_Char_Table *disptab = buffer_display_table ();
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
8435
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
8436 if (! disptab_matches_widthtab (disptab,
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
8437 XVECTOR (current_buffer->width_table)))
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
8438 {
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
8439 invalidate_region_cache (current_buffer,
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
8440 current_buffer->width_run_cache,
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
8441 BEG, Z);
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
8442 recompute_width_table (current_buffer, disptab);
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
8443 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
8444 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
8445
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8446 /* If window-start is screwed up, choose a new one. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8447 if (XMARKER (w->start)->buffer != current_buffer)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8448 goto recenter;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8449
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8450 SET_TEXT_POS_FROM_MARKER (startp, w->start);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8451
16554
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
8452 /* If someone specified a new starting point but did not insist,
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
8453 check whether it can be used. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8454 if (!NILP (w->optional_new_start))
16554
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
8455 {
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
8456 w->optional_new_start = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8457 /* This takes a mini-buffer prompt into account. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8458 start_display (&it, w, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8459 move_it_to (&it, PT, 0, it.last_visible_y, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8460 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8461 if (IT_CHARPOS (it) == PT)
16554
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
8462 w->force_start = Qt;
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
8463 }
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
8464
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
8465 /* 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
8466 unless the specified location is outside the accessible range. */
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
8467 if (!NILP (w->force_start)
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
8468 || w->frozen_window_start_p)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8469 {
13833
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
8470 w->force_start = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8471 w->vscroll = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8472 w->window_end_valid = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8473
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
8474 /* Forget any recorded base line for line number display. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8475 if (!current_matrix_up_to_date_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8476 || current_buffer->clip_changed)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8477 w->base_line_number = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8478
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
8479 /* Redisplay the mode line. Select the buffer properly for that.
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
8480 Also, run the hook window-scroll-functions
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
8481 because we have scrolled. */
13833
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
8482 /* Note, we do this after clearing force_start because
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
8483 if there's an error, it is better to forget about force_start
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
8484 than to get into an infinite loop calling the hook functions
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
8485 and having them get more errors. */
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
8486 if (!update_mode_line
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
8487 || ! NILP (Vwindow_scroll_functions))
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
8488 {
21424
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
8489 if (!really_switched_buffer)
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
8490 {
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
8491 set_buffer_temp (old);
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
8492 set_buffer_internal_1 (XBUFFER (w->buffer));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8493 really_switched_buffer = 1;
21424
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
8494 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8495
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
8496 update_mode_line = 1;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
8497 w->update_mode_line = Qt;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8498 startp = run_window_scroll_functions (window, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8499 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8500
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
8501 XSETFASTINT (w->last_modified, 0);
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
8502 XSETFASTINT (w->last_overlay_modified, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8503 if (CHARPOS (startp) < BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8504 SET_TEXT_POS (startp, BEGV, BEGV_BYTE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8505 else if (CHARPOS (startp) > ZV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8506 SET_TEXT_POS (startp, ZV, ZV_BYTE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8507
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8508 /* Redisplay, then check if cursor has been set during the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8509 redisplay. Give up if new fonts were loaded. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8510 if (!try_window (window, startp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8511 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8512 w->force_start = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8513 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8514 goto restore_buffers;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8515 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8516
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
8517 if (w->cursor.vpos < 0 && !w->frozen_window_start_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8518 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8519 /* If point does not appear, or on a line that is not fully
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8520 visible, move point so it does appear. The desired
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8521 matrix has been built above, so we can use it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8522 int height = window_box_height (w) / 2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8523 struct glyph_row *row = MATRIX_ROW (w->desired_matrix, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8524
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8525 while (row->y < height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8526 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8527
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8528 TEMP_SET_PT_BOTH (MATRIX_ROW_START_CHARPOS (row),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8529 MATRIX_ROW_START_BYTEPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8530
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
8531 if (w != XWINDOW (selected_window))
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
8532 set_marker_both (w->pointm, Qnil, PT, PT_BYTE);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8533 else if (current_buffer == old)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8534 SET_TEXT_POS (lpoint, PT, PT_BYTE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8535
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8536 set_cursor_from_row (w, row, w->desired_matrix, 0, 0, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8537
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8538 /* If we are highlighting the region, then we just changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8539 the region, so redisplay to show it. */
9218
db4473eb2265 (redisplay_window): If we set PT, and that alters a region
Richard M. Stallman <rms@gnu.org>
parents: 9104
diff changeset
8540 if (!NILP (Vtransient_mark_mode)
db4473eb2265 (redisplay_window): If we set PT, and that alters a region
Richard M. Stallman <rms@gnu.org>
parents: 9104
diff changeset
8541 && !NILP (current_buffer->mark_active))
9420
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
8542 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8543 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8544 if (!try_window (window, startp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8545 goto restore_buffers;
9420
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
8546 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8547 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8548
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8549 make_cursor_line_fully_visible (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8550 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8551 debug_method_add (w, "forced window start");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8552 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8553 goto done;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8554 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8555
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8556 /* Handle case where text has not changed, only point, and it has
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8557 not moved off the frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8558 if (current_matrix_up_to_date_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8559 /* Point may be in this window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8560 && PT >= CHARPOS (startp)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8561 /* If we don't check this, we are called to move the cursor in a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8562 horizontally split window with a current matrix that doesn't
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8563 fit the display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8564 && !windows_or_buffers_changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8565 /* Selective display hasn't changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8566 && !current_buffer->clip_changed
11085
a9c7a7f91693 (redisplay_window): Skip the only-point-has-changed
Richard M. Stallman <rms@gnu.org>
parents: 11066
diff changeset
8567 /* If force-mode-line-update was called, really redisplay;
a9c7a7f91693 (redisplay_window): Skip the only-point-has-changed
Richard M. Stallman <rms@gnu.org>
parents: 11066
diff changeset
8568 that's how redisplay is forced after e.g. changing
a9c7a7f91693 (redisplay_window): Skip the only-point-has-changed
Richard M. Stallman <rms@gnu.org>
parents: 11066
diff changeset
8569 buffer-invisibility-spec. */
11111
e3022a32d11d (try_window_id): Stop scan at bottom of window, not one line later.
Karl Heuer <kwzh@gnu.org>
parents: 11108
diff changeset
8570 && NILP (w->update_mode_line)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8571 /* Can't use this case if highlighting a region. When a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8572 region exists, cursor movement has to do more than just
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8573 set the cursor. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8574 && !(!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8575 && !NILP (current_buffer->mark_active))
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
8576 && NILP (w->region_showing)
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
8577 && NILP (Vshow_trailing_whitespace)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8578 /* Right after splitting windows, last_point may be nil. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8579 && INTEGERP (w->last_point)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8580 /* This code is not used for mini-buffer for the sake of the case
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8581 of redisplaying to replace an echo area message; since in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8582 that case the mini-buffer contents per se are usually
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8583 unchanged. This code is of no real use in the mini-buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8584 since the handling of this_line_start_pos, etc., in redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8585 handles the same cases. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8586 && !EQ (window, minibuf_window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8587 /* When splitting windows or for new windows, it happens that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8588 redisplay is called with a nil window_end_vpos or one being
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8589 larger than the window. This should really be fixed in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8590 window.c. I don't have this on my list, now, so we do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8591 approximately the same as the old redisplay code. --gerd. */
7927
e02087efad68 (redisplay_window): Don't use shortcut if window_end_vpos is out of date.
Karl Heuer <kwzh@gnu.org>
parents: 7913
diff changeset
8592 && INTEGERP (w->window_end_vpos)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8593 && XFASTINT (w->window_end_vpos) < w->current_matrix->nrows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8594 && (FRAME_WINDOW_P (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8595 || !MARKERP (Voverlay_arrow_position)
19375
83132785cf7f (COERCE_MARKER): Use Fmarker_position instead of
Richard M. Stallman <rms@gnu.org>
parents: 19225
diff changeset
8596 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8597 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8598 int this_scroll_margin;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8599 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8600 int scroll_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8601
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8602 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8603 debug_method_add (w, "cursor movement");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8604 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8605
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8606 /* Scroll if point within this distance from the top or bottom
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8607 of the window. This is a pixel value. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8608 this_scroll_margin = max (0, scroll_margin);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8609 this_scroll_margin = min (this_scroll_margin, XFASTINT (w->height) / 4);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8610 this_scroll_margin *= CANON_Y_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8611
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8612 /* Start with the row the cursor was displayed during the last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8613 not paused redisplay. Give up if that row is not valid. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8614 if (w->last_cursor.vpos >= w->current_matrix->nrows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8615 goto try_to_scroll;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8616 row = MATRIX_ROW (w->current_matrix, w->last_cursor.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8617 if (row->mode_line_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8618 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8619 if (!row->enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8620 goto try_to_scroll;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8621
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8622 scroll_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8623 if (PT > XFASTINT (w->last_point))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8624 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8625 /* Point has moved forward. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8626 int last_y = window_text_bottom_y (w) - this_scroll_margin;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8627
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8628 while ((MATRIX_ROW_END_CHARPOS (row) < PT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8629 /* The end position of a row equals the start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8630 position of the next row. If PT is there, we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8631 would rather display it in the next line, except
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8632 when this line ends in ZV. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8633 || (MATRIX_ROW_END_CHARPOS (row) == PT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8634 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8635 || !row->ends_at_zv_p)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8636 && MATRIX_ROW_BOTTOM_Y (row) < last_y)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8637 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8638 xassert (row->enabled_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8639 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8640 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8641
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8642 /* If within the scroll margin, scroll. Note that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8643 MATRIX_ROW_BOTTOM_Y gives the pixel position at which the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8644 next line would be drawn, and that this_scroll_margin can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8645 be zero. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8646 if (MATRIX_ROW_BOTTOM_Y (row) > last_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8647 || PT > MATRIX_ROW_END_CHARPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8648 /* Line is completely visible last line in window and PT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8649 is to be set in the next line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8650 || (MATRIX_ROW_BOTTOM_Y (row) == last_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8651 && PT == MATRIX_ROW_END_CHARPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8652 && !row->ends_at_zv_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8653 && !MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8654 scroll_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8655 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8656 else if (PT < XFASTINT (w->last_point))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8657 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8658 /* Cursor has to be moved backward. Note that PT >=
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8659 CHARPOS (startp) because of the outer if-statement. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8660 while (!row->mode_line_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8661 && (MATRIX_ROW_START_CHARPOS (row) > PT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8662 || (MATRIX_ROW_START_CHARPOS (row) == PT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8663 && MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P (row)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8664 && (row->y > this_scroll_margin
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8665 || CHARPOS (startp) == BEGV))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8666 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8667 xassert (row->enabled_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8668 --row;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8669 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8670
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8671 /* Consider the following case: Window starts at BEGV, there
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8672 is invisible, intangible text at BEGV, so that display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8673 starts at some point START > BEGV. It can happen that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8674 we are called with PT somewhere between BEGV and START.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8675 Try to handle that case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8676 if (row < w->current_matrix->rows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8677 || row->mode_line_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8678 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8679 row = w->current_matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8680 if (row->mode_line_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8681 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8682 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8683
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8684 /* Due to newlines in overlay strings, we may have to skip
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8685 forward over overlay strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8686 while (MATRIX_ROW_END_CHARPOS (row) == PT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8687 && MATRIX_ROW_ENDS_IN_OVERLAY_STRING_P (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8688 && !row->ends_at_zv_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8689 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8690
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8691 /* If within the scroll margin, scroll. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8692 if (row->y < this_scroll_margin
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8693 && CHARPOS (startp) != BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8694 scroll_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8695 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8696
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8697 /* if PT is not in the glyph row, give up. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8698 if (PT < MATRIX_ROW_START_CHARPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8699 || PT > MATRIX_ROW_END_CHARPOS (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8700 goto try_to_scroll;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8701
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8702 /* If we end up in a partially visible line, let's make it fully
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8703 visible. This can be done most easily by using the existing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8704 scrolling code. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8705 if (MATRIX_ROW_PARTIALLY_VISIBLE_P (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8706 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8707 temp_scroll_step = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8708 goto try_to_scroll;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8709 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8710 else if (scroll_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8711 goto try_to_scroll;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8712
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8713 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8714 goto done;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8715 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8716
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8717 /* If current starting point was originally the beginning of a line
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8718 but no longer is, find a new starting point. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
8719 else if (!NILP (w->start_at_line_beg)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8720 && !(CHARPOS (startp) <= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8721 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n'))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8722 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8723 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8724 debug_method_add (w, "recenter 1");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8725 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8726 goto recenter;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8727 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8728
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8729 /* Try scrolling with try_window_id. */
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8730 else if (/* Windows and buffers haven't changed. */
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8731 !windows_or_buffers_changed
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8732 /* Window must be either use window-based redisplay or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8733 be full width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8734 && (FRAME_WINDOW_P (f)
25388
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
8735 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w)))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8736 && !MINI_WINDOW_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8737 /* Point is not known NOT to appear in window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8738 && PT >= CHARPOS (startp)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8739 && XFASTINT (w->last_modified)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8740 /* Window is not hscrolled. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8741 && XFASTINT (w->hscroll) == 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8742 /* Selective display has not changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8743 && !current_buffer->clip_changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8744 /* Current matrix is up to date. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8745 && !NILP (w->window_end_valid)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8746 /* Can't use this case if highlighting a region because
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8747 a cursor movement will do more than just set the cursor. */
2848
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
8748 && !(!NILP (Vtransient_mark_mode)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
8749 && !NILP (current_buffer->mark_active))
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
8750 && NILP (w->region_showing)
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
8751 && NILP (Vshow_trailing_whitespace)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8752 /* Overlay arrow position and string not changed. */
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
8753 && EQ (last_arrow_position, COERCE_MARKER (Voverlay_arrow_position))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8754 && EQ (last_arrow_string, Voverlay_arrow_string)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8755 /* Value is > 0 if update has been done, it is -1 if we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8756 know that the same window start will not work. It is 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8757 if unsuccessful for some other reason. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8758 && (tem = try_window_id (w)) != 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8759 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8760 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8761 debug_method_add (w, "try_window_id");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8762 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8763
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8764 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8765 goto restore_buffers;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8766 if (tem > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8767 goto done;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8768 /* Otherwise try_window_id has returned -1 which means that we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8769 don't want the alternative below this comment to execute. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8770 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8771 else if (CHARPOS (startp) >= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8772 && CHARPOS (startp) <= ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8773 && PT >= CHARPOS (startp)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8774 && (CHARPOS (startp) < ZV
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
8775 /* Avoid starting at end of buffer. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8776 || CHARPOS (startp) == BEGV
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
8777 || (XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
8778 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8779 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8780 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8781 debug_method_add (w, "same window start");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8782 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8783
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8784 /* Try to redisplay starting at same place as before.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8785 If point has not moved off frame, accept the results. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8786 if (!current_matrix_up_to_date_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8787 /* Don't use try_window_reusing_current_matrix in this case
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8788 because it can have changed the buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8789 || !NILP (Vwindow_scroll_functions)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8790 || MINI_WINDOW_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8791 || !try_window_reusing_current_matrix (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8792 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8793 IF_DEBUG (debug_method_add (w, "1"));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8794 try_window (window, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8795 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8796
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8797 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8798 goto restore_buffers;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8799
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8800 if (w->cursor.vpos >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8801 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8802 if (!just_this_one_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8803 || current_buffer->clip_changed
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8804 || BEG_UNCHANGED < CHARPOS (startp))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
8805 /* 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
8806 w->base_line_number = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8807
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8808 make_cursor_line_fully_visible (w);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
8809 goto done;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
8810 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8811 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8812 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8813 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8814
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8815 try_to_scroll:
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8816
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
8817 XSETFASTINT (w->last_modified, 0);
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
8818 XSETFASTINT (w->last_overlay_modified, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8819
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
8820 /* Redisplay the mode line. Select the buffer properly for that. */
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
8821 if (!update_mode_line)
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
8822 {
21424
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
8823 if (!really_switched_buffer)
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
8824 {
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
8825 set_buffer_temp (old);
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
8826 set_buffer_internal_1 (XBUFFER (w->buffer));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8827 really_switched_buffer = 1;
21424
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
8828 }
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
8829 update_mode_line = 1;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
8830 w->update_mode_line = Qt;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
8831 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8832
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8833 /* Try to scroll by specified few lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8834 if ((scroll_conservatively
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8835 || scroll_step
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8836 || temp_scroll_step
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8837 || NUMBERP (current_buffer->scroll_up_aggressively)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8838 || NUMBERP (current_buffer->scroll_down_aggressively))
22030
484c9b2f6308 (redisplay_window): Handle scroll_step along with
Richard M. Stallman <rms@gnu.org>
parents: 22011
diff changeset
8839 && !current_buffer->clip_changed
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8840 && CHARPOS (startp) >= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8841 && CHARPOS (startp) <= ZV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8842 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8843 /* The function returns -1 if new fonts were loaded, 1 if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8844 successful, 0 if not successful. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8845 int rc = try_scrolling (window, just_this_one_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8846 scroll_conservatively,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8847 scroll_step,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8848 temp_scroll_step);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8849 if (rc > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8850 goto done;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8851 else if (rc < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8852 goto restore_buffers;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8853 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8854
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8855 /* Finally, just choose place to start which centers point */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8856
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8857 recenter:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8858
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8859 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8860 debug_method_add (w, "recenter");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8861 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8862
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8863 /* w->vscroll = 0; */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8864
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8865 /* Forget any previously recorded base line for line number display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8866 if (!current_matrix_up_to_date_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8867 || current_buffer->clip_changed)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8868 w->base_line_number = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8869
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8870 /* Move backward half the height of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8871 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8872 it.current_y = it.last_visible_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8873 move_it_vertically_backward (&it, it.last_visible_y / 2);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8874 xassert (IT_CHARPOS (it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8875
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8876 /* The function move_it_vertically_backward may move over more
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8877 than the specified y-distance. If it->w is small, e.g. a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8878 mini-buffer window, we may end up in front of the window's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8879 display area. Start displaying at the start of the line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8880 containing PT in this case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8881 if (it.current_y <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8882 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8883 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8884 move_it_vertically (&it, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8885 xassert (IT_CHARPOS (it) <= PT);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8886 it.current_y = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8887 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8888
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8889 it.current_x = it.hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8890
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8891 /* Set startp here explicitly in case that helps avoid an infinite loop
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8892 in case the window-scroll-functions functions get errors. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8893 set_marker_both (w->start, Qnil, IT_CHARPOS (it), IT_BYTEPOS (it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8894
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8895 /* Run scroll hooks. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8896 startp = run_window_scroll_functions (window, it.current.pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8897
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8898 /* Redisplay the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8899 if (!current_matrix_up_to_date_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8900 || windows_or_buffers_changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8901 /* Don't use try_window_reusing_current_matrix in this case
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8902 because it can have changed the buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8903 || !NILP (Vwindow_scroll_functions)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8904 || !just_this_one_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8905 || MINI_WINDOW_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8906 || !try_window_reusing_current_matrix (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8907 try_window (window, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8908
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8909 /* If new fonts have been loaded (due to fontsets), give up. We
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8910 have to start a new redisplay since we need to re-adjust glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8911 matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8912 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8913 goto restore_buffers;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8914
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8915 /* If cursor did not appear assume that the middle of the window is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8916 in the first line of the window. Do it again with the next line.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8917 (Imagine a window of height 100, displaying two lines of height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8918 60. Moving back 50 from it->last_visible_y will end in the first
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8919 line.) */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8920 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8921 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8922 if (!NILP (w->window_end_valid)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8923 && PT >= Z - XFASTINT (w->window_end_pos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8924 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8925 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8926 move_it_by_lines (&it, 1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8927 try_window (window, it.current.pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8928 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8929 else if (PT < IT_CHARPOS (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8930 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8931 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8932 move_it_by_lines (&it, -1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8933 try_window (window, it.current.pos);
19571
28ab022089b2 (redisplay_window): When trying to scroll conservatively
Richard M. Stallman <rms@gnu.org>
parents: 19562
diff changeset
8934 }
21845
1bae35c78db2 (redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents: 21825
diff changeset
8935 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8936 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8937 /* Not much we can do about it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8938 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8939 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8940
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8941 /* Consider the following case: Window starts at BEGV, there is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8942 invisible, intangible text at BEGV, so that display starts at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8943 some point START > BEGV. It can happen that we are called with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8944 PT somewhere between BEGV and START. Try to handle that case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8945 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8946 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8947 struct glyph_row *row = w->current_matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8948 if (row->mode_line_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8949 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8950 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8951 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8952
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8953 make_cursor_line_fully_visible (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8954
25695
9e6edb8bc242 (redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents: 25693
diff changeset
8955 done:
9e6edb8bc242 (redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents: 25693
diff changeset
8956
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8957 SET_TEXT_POS_FROM_MARKER (startp, w->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8958 w->start_at_line_beg = ((CHARPOS (startp) == BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8959 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8960 ? Qt : Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8961
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8962 /* Display the mode line, if we must. */
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
8963 if ((update_mode_line
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
8964 /* If window not full width, must redo its mode line
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8965 if (a) the window to its side is being redone and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8966 (b) we do a frame-based redisplay. This is a consequence
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8967 of how inverted lines are drawn in frame-based redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8968 || (!just_this_one_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8969 && !FRAME_WINDOW_P (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8970 && !WINDOW_FULL_WIDTH_P (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8971 /* Line number to display. */
10441
f1fc7b6e5fa4 (redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents: 10416
diff changeset
8972 || INTEGERP (w->base_line_pos)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8973 /* Column number is displayed and different from the one displayed. */
10441
f1fc7b6e5fa4 (redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents: 10416
diff changeset
8974 || (!NILP (w->column_number_displayed)
f1fc7b6e5fa4 (redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents: 10416
diff changeset
8975 && XFASTINT (w->column_number_displayed) != current_column ()))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8976 /* This means that the window has a mode line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8977 && (WINDOW_WANTS_MODELINE_P (w)
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
8978 || WINDOW_WANTS_HEADER_LINE_P (w)))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8979 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8980 display_mode_lines (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8981
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8982 /* If mode line height has changed, arrange for a thorough
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8983 immediate redisplay using the correct mode line height. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8984 if (WINDOW_WANTS_MODELINE_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8985 && CURRENT_MODE_LINE_HEIGHT (w) != DESIRED_MODE_LINE_HEIGHT (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8986 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8987 fonts_changed_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8988 MATRIX_MODE_LINE_ROW (w->current_matrix)->height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8989 = DESIRED_MODE_LINE_HEIGHT (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8990 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8991
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8992 /* If top line height has changed, arrange for a thorough
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8993 immediate redisplay using the correct mode line height. */
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
8994 if (WINDOW_WANTS_HEADER_LINE_P (w)
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
8995 && CURRENT_HEADER_LINE_HEIGHT (w) != DESIRED_HEADER_LINE_HEIGHT (w))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8996 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8997 fonts_changed_p = 1;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
8998 MATRIX_HEADER_LINE_ROW (w->current_matrix)->height
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
8999 = DESIRED_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9000 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9001
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9002 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9003 goto restore_buffers;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9004 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9005
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9006 if (!line_number_displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9007 && !BUFFERP (w->base_line_pos))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9008 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9009 w->base_line_pos = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9010 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9011 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9012
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9013 finish_menu_bars:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9014
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
9015 /* When we reach a frame's selected window, redo the frame's menu bar. */
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9016 if (update_mode_line
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9017 && EQ (FRAME_SELECTED_WINDOW (f), window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9018 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9019 int redisplay_menu_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9020
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9021 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9022 {
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
9023 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9024 redisplay_menu_p = FRAME_EXTERNAL_MENU_BAR (f);
5658
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
9025 #else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9026 redisplay_menu_p = 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
9027 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9028 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9029 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9030 redisplay_menu_p = FRAME_MENU_BAR_LINES (f) > 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9031
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9032 if (redisplay_menu_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9033 display_menu_bar (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9034
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9035 #ifdef HAVE_WINDOW_SYSTEM
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9036 if (WINDOWP (f->tool_bar_window)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9037 && (FRAME_TOOL_BAR_LINES (f) > 0
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9038 || auto_resize_tool_bars_p))
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9039 redisplay_tool_bar (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9040 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9041 }
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
9042
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
9043 finish_scroll_bars:
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9044
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
9045 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
9046 {
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9047 int start, end, whole;
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9048
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9049 /* 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
9050 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
9051 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
9052 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
9053 visible region.
80805283464a * xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents: 2848
diff changeset
9054
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9055 Note that mini-buffers sometimes aren't displaying any text. */
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
9056 if (!MINI_WINDOW_P (w)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9057 || (w == XWINDOW (minibuf_window)
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
9058 && NILP (echo_area_buffer[0])))
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9059 {
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
9060 whole = ZV - BEGV;
11108
ad6e21535db6 (redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents: 11085
diff changeset
9061 start = marker_position (w->start) - BEGV;
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9062 /* 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
9063 moment, we'll pretend it is. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9064 end = (Z - XFASTINT (w->window_end_pos)) - BEGV;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9065
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9066 if (end < start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9067 end = start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9068 if (whole < (end - start))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9069 whole = end - start;
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9070 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9071 else
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9072 start = end = whole = 0;
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9073
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
9074 /* 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
9075 (*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
9076
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9077 /* Note that we actually used the scroll bar attached to this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9078 window, 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
9079 (*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
9080 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9081
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9082 restore_buffers:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9083
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9084 /* Restore current_buffer and value of point in it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9085 TEMP_SET_PT_BOTH (CHARPOS (opoint), BYTEPOS (opoint));
21424
fbfd26142e76 (redisplay_window): If updating mode line,
Richard M. Stallman <rms@gnu.org>
parents: 21335
diff changeset
9086 if (really_switched_buffer)
11888
23ec1c193810 (redisplay_window): Use set_buffer_internal_1.
Karl Heuer <kwzh@gnu.org>
parents: 11874
diff changeset
9087 set_buffer_internal_1 (old);
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9088 else
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9089 set_buffer_temp (old);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9090 TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint));
21748
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
9091
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
9092 unbind_to (count, Qnil);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9093 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9094
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9095
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9096 /* Build the complete desired matrix of WINDOW with a window start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9097 buffer position POS. Value is non-zero if successful. It is zero
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9098 if fonts were loaded during redisplay which makes re-adjusting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9099 glyph matrices necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9100
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9101 int
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9102 try_window (window, pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9103 Lisp_Object window;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9104 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9105 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9106 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9107 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9108 struct glyph_row *last_text_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9109
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9110 /* Make POS the new window start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9111 set_marker_both (w->start, Qnil, CHARPOS (pos), BYTEPOS (pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9112
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9113 /* Mark cursor position as unknown. No overlay arrow seen. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9114 w->cursor.vpos = -1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9115 overlay_arrow_seen = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9116
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9117 /* Initialize iterator and info to start at POS. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9118 start_display (&it, w, pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9119
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9120 /* Display all lines of W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9121 while (it.current_y < it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9122 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9123 if (display_line (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9124 last_text_row = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9125 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9126 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9127 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9128
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9129 /* If bottom moved off end of frame, change mode line percentage. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9130 if (XFASTINT (w->window_end_pos) <= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9131 && Z != IT_CHARPOS (it))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9132 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9133
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9134 /* Set window_end_pos to the offset of the last character displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9135 on the window from the end of current_buffer. Set
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9136 window_end_vpos to its row number. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9137 if (last_text_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9138 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9139 xassert (MATRIX_ROW_DISPLAYS_TEXT_P (last_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9140 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9141 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9142 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9143 Z - MATRIX_ROW_END_CHARPOS (last_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9144 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9145 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9146 xassert (MATRIX_ROW (w->desired_matrix, XFASTINT (w->window_end_vpos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9147 ->displays_text_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9148 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9149 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9150 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9151 w->window_end_bytepos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9152 XSETFASTINT (w->window_end_pos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9153 XSETFASTINT (w->window_end_vpos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9154 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9155
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9156 /* But that is not valid info until redisplay finishes. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9157 w->window_end_valid = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9158 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9159 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9160
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9161
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9162
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9163 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9164 Window redisplay reusing current matrix when buffer has not changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9165 ************************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9166
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9167 /* Try redisplay of window W showing an unchanged buffer with a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9168 different window start than the last time it was displayed by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9169 reusing its current matrix. Value is non-zero if successful.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9170 W->start is the new window start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9171
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9172 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9173 try_window_reusing_current_matrix (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9174 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9175 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9176 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9177 struct glyph_row *row, *bottom_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9178 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9179 struct run run;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9180 struct text_pos start, new_start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9181 int nrows_scrolled, i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9182 struct glyph_row *last_text_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9183 struct glyph_row *last_reused_text_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9184 struct glyph_row *start_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9185 int start_vpos, min_y, max_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9186
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9187 /* Right now this function doesn't handle terminal frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9188 if (!FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9189 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9190
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9191 /* Can't do this if region may have changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9192 if ((!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9193 && !NILP (current_buffer->mark_active))
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
9194 || !NILP (w->region_showing)
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
9195 || !NILP (Vshow_trailing_whitespace))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9196 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9197
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9198 /* If top-line visibility has changed, give up. */
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9199 if (WINDOW_WANTS_HEADER_LINE_P (w)
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9200 != MATRIX_HEADER_LINE_ROW (w->current_matrix)->mode_line_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9201 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9202
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9203 /* Give up if old or new display is scrolled vertically. We could
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9204 make this function handle this, but right now it doesn't. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9205 start_row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9206 if (w->vscroll || MATRIX_ROW_PARTIALLY_VISIBLE_P (start_row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9207 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9208
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9209 /* The variable new_start now holds the new window start. The old
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9210 start `start' can be determined from the current matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9211 SET_TEXT_POS_FROM_MARKER (new_start, w->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9212 start = start_row->start.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9213 start_vpos = MATRIX_ROW_VPOS (start_row, w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9214
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9215 /* Clear the desired matrix for the display below. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9216 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9217
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9218 if (CHARPOS (new_start) <= CHARPOS (start))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9219 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9220 int first_row_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9221
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9222 IF_DEBUG (debug_method_add (w, "twu1"));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9223
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9224 /* Display up to a row that can be reused. The variable
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9225 last_text_row is set to the last row displayed that displays
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9226 text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9227 start_display (&it, w, new_start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9228 first_row_y = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9229 w->cursor.vpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9230 last_text_row = last_reused_text_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9231 while (it.current_y < it.last_visible_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9232 && IT_CHARPOS (it) < CHARPOS (start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9233 && !fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9234 if (display_line (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9235 last_text_row = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9236
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9237 /* A value of current_y < last_visible_y means that we stopped
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9238 at the previous window start, which in turn means that we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9239 have at least one reusable row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9240 if (it.current_y < it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9241 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9242 nrows_scrolled = it.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9243
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9244 /* Find PT if not already found in the lines displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9245 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9246 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9247 int dy = it.current_y - first_row_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9248
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9249 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9250 while (MATRIX_ROW_DISPLAYS_TEXT_P (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9251 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9252 if (PT >= MATRIX_ROW_START_CHARPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9253 && PT < MATRIX_ROW_END_CHARPOS (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9254 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9255 set_cursor_from_row (w, row, w->current_matrix, 0, 0,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9256 dy, nrows_scrolled);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9257 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9258 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9259
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9260 if (MATRIX_ROW_BOTTOM_Y (row) + dy >= it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9261 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9262
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9263 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9264 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9265
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9266 /* Give up if point was not found. This shouldn't
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9267 happen often; not more often than with try_window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9268 itself. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9269 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9270 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9271 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9272 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9273 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9274 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9275
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9276 /* Scroll the display. Do it before the current matrix is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9277 changed. The problem here is that update has not yet
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9278 run, i.e. part of the current matrix is not up to date.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9279 scroll_run_hook will clear the cursor, and use the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9280 current matrix to get the height of the row the cursor is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9281 in. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9282 run.current_y = first_row_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9283 run.desired_y = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9284 run.height = it.last_visible_y - it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9285 if (run.height > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9286 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9287 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9288 rif->update_window_begin_hook (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9289 rif->scroll_run_hook (w, &run);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9290 rif->update_window_end_hook (w, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9291 update_end (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9292 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9293
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9294 /* Shift current matrix down by nrows_scrolled lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9295 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9296 rotate_matrix (w->current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9297 start_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9298 MATRIX_ROW_VPOS (bottom_row, w->current_matrix),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9299 nrows_scrolled);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9300
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9301 /* Disable lines not reused. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9302 for (i = 0; i < it.vpos; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9303 MATRIX_ROW (w->current_matrix, i)->enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9304
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9305 /* Re-compute Y positions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9306 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix) + nrows_scrolled;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9307 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9308 max_y = it.last_visible_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9309 while (row < bottom_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9310 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9311 row->y = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9312
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9313 if (row->y < min_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9314 row->visible_height = row->height - (min_y - row->y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9315 else if (row->y + row->height > max_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9316 row->visible_height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9317 = row->height - (row->y + row->height - max_y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9318 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9319 row->visible_height = row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9320
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9321 it.current_y += row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9322 ++it.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9323
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9324 if (MATRIX_ROW_DISPLAYS_TEXT_P (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9325 last_reused_text_row = row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9326 if (MATRIX_ROW_BOTTOM_Y (row) >= it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9327 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9328 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9329 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9330 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9331
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9332 /* Update window_end_pos etc.; last_reused_text_row is the last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9333 reused row from the current matrix containing text, if any.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9334 The value of last_text_row is the last displayed line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9335 containing text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9336 if (last_reused_text_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9337 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9338 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9339 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_reused_text_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9340 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9341 Z - MATRIX_ROW_END_CHARPOS (last_reused_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9342 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9343 MATRIX_ROW_VPOS (last_reused_text_row,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9344 w->current_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9345 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9346 else if (last_text_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9347 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9348 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9349 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9350 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9351 Z - MATRIX_ROW_END_CHARPOS (last_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9352 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9353 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9354 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9355 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9356 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9357 /* This window must be completely empty. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9358 w->window_end_bytepos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9359 XSETFASTINT (w->window_end_pos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9360 XSETFASTINT (w->window_end_vpos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9361 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9362 w->window_end_valid = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9363
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9364 /* Update hint: don't try scrolling again in update_window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9365 w->desired_matrix->no_scrolling_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9366
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9367 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9368 debug_method_add (w, "try_window_reusing_current_matrix 1");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9369 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9370 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9371 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9372 else if (CHARPOS (new_start) > CHARPOS (start))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9373 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9374 struct glyph_row *pt_row, *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9375 struct glyph_row *first_reusable_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9376 struct glyph_row *first_row_to_display;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9377 int dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9378 int yb = window_text_bottom_y (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9379
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9380 IF_DEBUG (debug_method_add (w, "twu2"));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9381
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9382 /* Find the row starting at new_start, if there is one. Don't
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9383 reuse a partially visible line at the end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9384 first_reusable_row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9385 while (first_reusable_row->enabled_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9386 && MATRIX_ROW_BOTTOM_Y (first_reusable_row) < yb
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9387 && (MATRIX_ROW_START_CHARPOS (first_reusable_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9388 < CHARPOS (new_start)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9389 ++first_reusable_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9390
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9391 /* Give up if there is no row to reuse. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9392 if (MATRIX_ROW_BOTTOM_Y (first_reusable_row) >= yb
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
9393 || !first_reusable_row->enabled_p
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
9394 || (MATRIX_ROW_START_CHARPOS (first_reusable_row)
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
9395 != CHARPOS (new_start)))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9396 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9397
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9398 /* We can reuse fully visible rows beginning with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9399 first_reusable_row to the end of the window. Set
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9400 first_row_to_display to the first row that cannot be reused.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9401 Set pt_row to the row containing point, if there is any. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9402 first_row_to_display = first_reusable_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9403 pt_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9404 while (MATRIX_ROW_BOTTOM_Y (first_row_to_display) < yb)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9405 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9406 if (PT >= MATRIX_ROW_START_CHARPOS (first_row_to_display)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9407 && PT < MATRIX_ROW_END_CHARPOS (first_row_to_display))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9408 pt_row = first_row_to_display;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9409
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9410 ++first_row_to_display;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9411 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9412
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9413 /* Start displaying at the start of first_row_to_display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9414 xassert (first_row_to_display->y < yb);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9415 init_to_row_start (&it, w, first_row_to_display);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9416 nrows_scrolled = MATRIX_ROW_VPOS (first_reusable_row, w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9417 it.vpos = (MATRIX_ROW_VPOS (first_row_to_display, w->current_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9418 - nrows_scrolled);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9419 it.current_y = first_row_to_display->y - first_reusable_row->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9420
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9421 /* Display lines beginning with first_row_to_display in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9422 desired matrix. Set last_text_row to the last row displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9423 that displays text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9424 it.glyph_row = MATRIX_ROW (w->desired_matrix, it.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9425 if (pt_row == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9426 w->cursor.vpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9427 last_text_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9428 while (it.current_y < it.last_visible_y && !fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9429 if (display_line (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9430 last_text_row = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9431
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9432 /* Give up If point isn't in a row displayed or reused. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9433 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9434 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9435 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9436 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9437 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9438
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9439 /* If point is in a reused row, adjust y and vpos of the cursor
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9440 position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9441 if (pt_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9442 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9443 w->cursor.vpos -= MATRIX_ROW_VPOS (first_reusable_row,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9444 w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9445 w->cursor.y -= first_reusable_row->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9446 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9447
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9448 /* Scroll the display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9449 run.current_y = first_reusable_row->y;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9450 run.desired_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9451 run.height = it.last_visible_y - run.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9452 if (run.height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9453 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9454 struct frame *f = XFRAME (WINDOW_FRAME (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9455 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9456 rif->update_window_begin_hook (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9457 rif->scroll_run_hook (w, &run);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9458 rif->update_window_end_hook (w, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9459 update_end (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9460 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9461
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9462 /* Adjust Y positions of reused rows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9463 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9464 row = first_reusable_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9465 dy = first_reusable_row->y;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9466 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9467 max_y = it.last_visible_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9468 while (row < first_row_to_display)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9469 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9470 row->y -= dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9471 if (row->y < min_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9472 row->visible_height = row->height - (min_y - row->y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9473 else if (row->y + row->height > max_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9474 row->visible_height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9475 = row->height - (row->y + row->height - max_y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9476 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9477 row->visible_height = row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9478 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9479 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9480
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9481 /* Disable rows not reused. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9482 while (row < bottom_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9483 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9484 row->enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9485 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9486 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9487
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9488 /* Scroll the current matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9489 xassert (nrows_scrolled > 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9490 rotate_matrix (w->current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9491 start_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9492 MATRIX_ROW_VPOS (bottom_row, w->current_matrix),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9493 -nrows_scrolled);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9494
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9495 /* Adjust window end. A null value of last_text_row means that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9496 the window end is in reused rows which in turn means that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9497 only its vpos can have changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9498 if (last_text_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9499 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9500 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9501 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9502 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9503 Z - MATRIX_ROW_END_CHARPOS (last_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9504 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9505 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9506 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9507 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9508 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9509 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9510 XFASTINT (w->window_end_vpos) - nrows_scrolled);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9511 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9512
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9513 w->window_end_valid = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9514 w->desired_matrix->no_scrolling_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9515
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9516 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9517 debug_method_add (w, "try_window_reusing_current_matrix 2");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9518 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9519 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9520 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9521
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9522 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9523 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9524
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9525
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9526
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9527 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9528 Window redisplay reusing current matrix when buffer has changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9529 ************************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9530
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9531 static struct glyph_row *get_last_unchanged_at_beg_row P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9532 static struct glyph_row *get_first_unchanged_at_end_row P_ ((struct window *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9533 int *, int *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9534 static struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9535 find_last_row_displaying_text P_ ((struct glyph_matrix *, struct it *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9536 struct glyph_row *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9537
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9538
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9539 /* Return the last row in MATRIX displaying text. If row START is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9540 non-null, start searching with that row. IT gives the dimensions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9541 of the display. Value is null if matrix is empty; otherwise it is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9542 a pointer to the row found. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9543
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9544 static struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9545 find_last_row_displaying_text (matrix, it, start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9546 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9547 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9548 struct glyph_row *start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9549 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9550 struct glyph_row *row, *row_found;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9551
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9552 /* Set row_found to the last row in IT->w's current matrix
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9553 displaying text. The loop looks funny but think of partially
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9554 visible lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9555 row_found = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9556 row = start ? start : MATRIX_FIRST_TEXT_ROW (matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9557 while (MATRIX_ROW_DISPLAYS_TEXT_P (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9558 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9559 xassert (row->enabled_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9560 row_found = row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9561 if (MATRIX_ROW_BOTTOM_Y (row) >= it->last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9562 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9563 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9564 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9565
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9566 return row_found;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9567 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9568
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9569
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9570 /* Return the last row in the current matrix of W that is not affected
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9571 by changes at the start of current_buffer that occurred since the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9572 last time W was redisplayed. Value is null if no such row exists.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9573
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9574 The global variable beg_unchanged has to contain the number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9575 bytes unchanged at the start of current_buffer. BEG +
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9576 beg_unchanged is the buffer position of the first changed byte in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9577 current_buffer. Characters at positions < BEG + beg_unchanged are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9578 at the same buffer positions as they were when the current matrix
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9579 was built. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9580
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9581 static struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9582 get_last_unchanged_at_beg_row (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9583 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9584 {
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9585 int first_changed_pos = BEG + BEG_UNCHANGED;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9586 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9587 struct glyph_row *row_found = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9588 int yb = window_text_bottom_y (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9589
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9590 /* Find the last row displaying unchanged text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9591 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9592 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9593 && MATRIX_ROW_START_CHARPOS (row) < first_changed_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9594 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9595 if (/* If row ends before first_changed_pos, it is unchanged,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9596 except in some case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9597 MATRIX_ROW_END_CHARPOS (row) <= first_changed_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9598 /* When row ends in ZV and we write at ZV it is not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9599 unchanged. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9600 && !row->ends_at_zv_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9601 /* When first_changed_pos is the end of a continued line,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9602 row is not unchanged because it may be no longer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9603 continued. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9604 && !(MATRIX_ROW_END_CHARPOS (row) == first_changed_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9605 && row->continued_p))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9606 row_found = row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9607
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9608 /* Stop if last visible row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9609 if (MATRIX_ROW_BOTTOM_Y (row) >= yb)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9610 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9611
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9612 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9613 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9614
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9615 return row_found;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9616 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9617
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9618
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9619 /* Find the first glyph row in the current matrix of W that is not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9620 affected by changes at the end of current_buffer since the last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9621 time the window was redisplayed. Return in *DELTA the number of
25388
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
9622 chars by which buffer positions in unchanged text at the end of
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
9623 current_buffer must be adjusted. Return in *DELTA_BYTES the
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
9624 corresponding number of bytes. Value is null if no such row
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
9625 exists, i.e. all rows are affected by changes. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9626
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9627 static struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9628 get_first_unchanged_at_end_row (w, delta, delta_bytes)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9629 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9630 int *delta, *delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9631 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9632 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9633 struct glyph_row *row_found = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9634
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9635 *delta = *delta_bytes = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9636
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9637 /* A value of window_end_pos >= end_unchanged means that the window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9638 end is in the range of changed text. If so, there is no
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9639 unchanged row at the end of W's current matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9640 xassert (!NILP (w->window_end_valid));
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9641 if (XFASTINT (w->window_end_pos) >= END_UNCHANGED)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9642 return NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9643
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9644 /* Set row to the last row in W's current matrix displaying text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9645 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9646
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9647 /* If matrix is entirely empty, no unchanged row exists. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9648 if (MATRIX_ROW_DISPLAYS_TEXT_P (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9649 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9650 /* The value of row is the last glyph row in the matrix having a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9651 meaningful buffer position in it. The end position of row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9652 corresponds to window_end_pos. This allows us to translate
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9653 buffer positions in the current matrix to current buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9654 positions for characters not in changed text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9655 int Z_old = MATRIX_ROW_END_CHARPOS (row) + XFASTINT (w->window_end_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9656 int Z_BYTE_old = MATRIX_ROW_END_BYTEPOS (row) + w->window_end_bytepos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9657 int last_unchanged_pos, last_unchanged_pos_old;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9658 struct glyph_row *first_text_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9659 = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9660
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9661 *delta = Z - Z_old;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9662 *delta_bytes = Z_BYTE - Z_BYTE_old;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9663
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9664 /* Set last_unchanged_pos to the buffer position of the last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9665 character in the buffer that has not been changed. Z is the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9666 index + 1 of the last byte in current_buffer, i.e. by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9667 subtracting end_unchanged we get the index of the last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9668 unchanged character, and we have to add BEG to get its buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9669 position. */
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9670 last_unchanged_pos = Z - END_UNCHANGED + BEG;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9671 last_unchanged_pos_old = last_unchanged_pos - *delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9672
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9673 /* Search backward from ROW for a row displaying a line that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9674 starts at a minimum position >= last_unchanged_pos_old. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9675 while (row >= first_text_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9676 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9677 xassert (row->enabled_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9678 xassert (MATRIX_ROW_DISPLAYS_TEXT_P (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9679
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9680 if (MATRIX_ROW_START_CHARPOS (row) >= last_unchanged_pos_old)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9681 row_found = row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9682 --row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9683 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9684 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9685
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9686 xassert (!row_found || MATRIX_ROW_DISPLAYS_TEXT_P (row_found));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9687 return row_found;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9688 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9689
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9690
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9691 /* Make sure that glyph rows in the current matrix of window W
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9692 reference the same glyph memory as corresponding rows in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9693 frame's frame matrix. This function is called after scrolling W's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9694 current matrix on a terminal frame in try_window_id and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9695 try_window_reusing_current_matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9696
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9697 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9698 sync_frame_with_window_matrix_rows (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9699 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9700 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9701 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9702 struct glyph_row *window_row, *window_row_end, *frame_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9703
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9704 /* Preconditions: W must be a leaf window and full-width. Its frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9705 must have a frame matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9706 xassert (NILP (w->hchild) && NILP (w->vchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9707 xassert (WINDOW_FULL_WIDTH_P (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9708 xassert (!FRAME_WINDOW_P (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9709
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9710 /* If W is a full-width window, glyph pointers in W's current matrix
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9711 have, by definition, to be the same as glyph pointers in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9712 corresponding frame matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9713 window_row = w->current_matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9714 window_row_end = window_row + w->current_matrix->nrows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9715 frame_row = f->current_matrix->rows + XFASTINT (w->top);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9716 while (window_row < window_row_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9717 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9718 int area;
25778
9a6099957160 (sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents: 25777
diff changeset
9719
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9720 for (area = LEFT_MARGIN_AREA; area <= LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9721 frame_row->glyphs[area] = window_row->glyphs[area];
25778
9a6099957160 (sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents: 25777
diff changeset
9722
9a6099957160 (sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents: 25777
diff changeset
9723 /* Disable frame rows whose corresponding window rows have
9a6099957160 (sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents: 25777
diff changeset
9724 been disabled in try_window_id. */
9a6099957160 (sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents: 25777
diff changeset
9725 if (!window_row->enabled_p)
9a6099957160 (sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents: 25777
diff changeset
9726 frame_row->enabled_p = 0;
9a6099957160 (sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents: 25777
diff changeset
9727
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9728 ++window_row, ++frame_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9729 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9730 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9731
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9732
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9733 /* Find the glyph row in window W containing CHARPOS. Consider all
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9734 rows between START and END (not inclusive). END null means search
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9735 all rows to the end of the display area of W. Value is the row
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9736 containing CHARPOS or null. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9737
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9738 static struct glyph_row *
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9739 row_containing_pos (w, charpos, start, end)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9740 struct window *w;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9741 int charpos;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9742 struct glyph_row *start, *end;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9743 {
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9744 struct glyph_row *row = start;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9745 int last_y;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9746
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9747 /* If we happen to start on a header-line, skip that. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9748 if (row->mode_line_p)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9749 ++row;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9750
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9751 if ((end && row >= end) || !row->enabled_p)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9752 return NULL;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9753
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9754 last_y = window_text_bottom_y (w);
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9755
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9756 while ((end == NULL || row < end)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9757 && (MATRIX_ROW_END_CHARPOS (row) < charpos
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9758 /* The end position of a row equals the start
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9759 position of the next row. If CHARPOS is there, we
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9760 would rather display it in the next line, except
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9761 when this line ends in ZV. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9762 || (MATRIX_ROW_END_CHARPOS (row) == charpos
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9763 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9764 || !row->ends_at_zv_p)))
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9765 && MATRIX_ROW_BOTTOM_Y (row) < last_y)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9766 ++row;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9767
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9768 /* Give up if CHARPOS not found. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9769 if ((end && row >= end)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9770 || charpos < MATRIX_ROW_START_CHARPOS (row)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9771 || charpos > MATRIX_ROW_END_CHARPOS (row))
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9772 row = NULL;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9773
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9774 return row;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9775 }
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9776
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9777
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9778 /* Try to redisplay window W by reusing its existing display. W's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9779 current matrix must be up to date when this function is called,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9780 i.e. window_end_valid must not be nil.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9781
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9782 Value is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9783
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9784 1 if display has been updated
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9785 0 if otherwise unsuccessful
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9786 -1 if redisplay with same window start is known not to succeed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9787
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9788 The following steps are performed:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9789
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9790 1. Find the last row in the current matrix of W that is not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9791 affected by changes at the start of current_buffer. If no such row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9792 is found, give up.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9793
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9794 2. Find the first row in W's current matrix that is not affected by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9795 changes at the end of current_buffer. Maybe there is no such row.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9796
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9797 3. Display lines beginning with the row + 1 found in step 1 to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9798 row found in step 2 or, if step 2 didn't find a row, to the end of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9799 the window.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9800
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9801 4. If cursor is not known to appear on the window, give up.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9802
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9803 5. If display stopped at the row found in step 2, scroll the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9804 display and current matrix as needed.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9805
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9806 6. Maybe display some lines at the end of W, if we must. This can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9807 happen under various circumstances, like a partially visible line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9808 becoming fully visible, or because newly displayed lines are displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9809 in smaller font sizes.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9810
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9811 7. Update W's window end information. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9812
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9813 /* Check that window end is what we expect it to be. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9814
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9815 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9816 try_window_id (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9817 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9818 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9819 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9820 struct glyph_matrix *current_matrix = w->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9821 struct glyph_matrix *desired_matrix = w->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9822 struct glyph_row *last_unchanged_at_beg_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9823 struct glyph_row *first_unchanged_at_end_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9824 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9825 struct glyph_row *bottom_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9826 int bottom_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9827 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9828 int delta = 0, delta_bytes = 0, stop_pos, dvpos, dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9829 struct text_pos start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9830 struct run run;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9831 int first_unchanged_at_end_vpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9832 struct glyph_row *last_text_row, *last_text_row_at_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9833 struct text_pos start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9834
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9835 SET_TEXT_POS_FROM_MARKER (start, w->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9836
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9837 /* Check pre-conditions. Window end must be valid, otherwise
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9838 the current matrix would not be up to date. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9839 xassert (!NILP (w->window_end_valid));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9840 xassert (FRAME_WINDOW_P (XFRAME (w->frame))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9841 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9842
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9843 /* Make sure beg_unchanged and end_unchanged are up to date. Do it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9844 only if buffer has really changed. The reason is that the gap is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9845 initially at Z for freshly visited files. The code below would
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9846 set end_unchanged to 0 in that case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9847 if (MODIFF > SAVE_MODIFF)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9848 {
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9849 if (GPT - BEG < BEG_UNCHANGED)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9850 BEG_UNCHANGED = GPT - BEG;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9851 if (Z - GPT < END_UNCHANGED)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9852 END_UNCHANGED = Z - GPT;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9853 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9854
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9855 /* If window starts after a line end, and the last change is in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9856 front of that newline, then changes don't affect the display.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9857 This case happens with stealth-fontification. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9858 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9859 if (CHARPOS (start) > BEGV
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9860 && Z - END_UNCHANGED < CHARPOS (start) - 1
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9861 && FETCH_BYTE (BYTEPOS (start) - 1) == '\n'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9862 && PT < MATRIX_ROW_END_CHARPOS (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9863 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9864 /* We have to update window end positions because the buffer's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9865 size has changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9866 w->window_end_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9867 = make_number (Z - MATRIX_ROW_END_CHARPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9868 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9869 = make_number (Z_BYTE - MATRIX_ROW_END_BYTEPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9870 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9871 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9872
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9873 /* Return quickly if changes are all below what is displayed in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9874 window, and if PT is in the window. */
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9875 if (BEG_UNCHANGED > MATRIX_ROW_END_CHARPOS (row)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9876 && PT < MATRIX_ROW_END_CHARPOS (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9877 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9878 /* We have to update window end positions because the buffer's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9879 size has changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9880 w->window_end_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9881 = make_number (Z - MATRIX_ROW_END_CHARPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9882 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9883 = make_number (Z_BYTE - MATRIX_ROW_END_BYTEPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9884 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9885 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9886
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9887 /* Check that window start agrees with the start of the first glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9888 row in its current matrix. Check this after we know the window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9889 start is not in changed text, otherwise positions would not be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9890 comparable. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9891 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9892 if (!TEXT_POS_EQUAL_P (start, row->start.pos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9893 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9894
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9895 /* Compute the position at which we have to start displaying new
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9896 lines. Some of the lines at the top of the window might be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9897 reusable because they are not displaying changed text. Find the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9898 last row in W's current matrix not affected by changes at the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9899 start of current_buffer. Value is null if changes start in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9900 first line of window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9901 last_unchanged_at_beg_row = get_last_unchanged_at_beg_row (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9902 if (last_unchanged_at_beg_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9903 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9904 init_to_row_end (&it, w, last_unchanged_at_beg_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9905 start_pos = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9906
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9907 /* Start displaying new lines in the desired matrix at the same
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9908 vpos we would use in the current matrix, i.e. below
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9909 last_unchanged_at_beg_row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9910 it.vpos = 1 + MATRIX_ROW_VPOS (last_unchanged_at_beg_row,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9911 current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9912 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9913 it.current_y = MATRIX_ROW_BOTTOM_Y (last_unchanged_at_beg_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9914
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9915 xassert (it.hpos == 0 && it.current_x == 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9916 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9917 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9918 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9919 /* There are no reusable lines at the start of the window.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9920 Start displaying in the first line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9921 start_display (&it, w, start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9922 start_pos = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9923 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9924
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9925 /* Find the first row that is not affected by changes at the end of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9926 the buffer. Value will be null if there is no unchanged row, in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9927 which case we must redisplay to the end of the window. delta
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9928 will be set to the value by which buffer positions beginning with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9929 first_unchanged_at_end_row have to be adjusted due to text
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9930 changes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9931 first_unchanged_at_end_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9932 = get_first_unchanged_at_end_row (w, &delta, &delta_bytes);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9933 IF_DEBUG (debug_delta = delta);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9934 IF_DEBUG (debug_delta_bytes = delta_bytes);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9935
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9936 /* Set stop_pos to the buffer position up to which we will have to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9937 display new lines. If first_unchanged_at_end_row != NULL, this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9938 is the buffer position of the start of the line displayed in that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9939 row. For first_unchanged_at_end_row == NULL, use 0 to indicate
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9940 that we don't stop at a buffer position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9941 stop_pos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9942 if (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9943 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9944 xassert (last_unchanged_at_beg_row == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9945 || first_unchanged_at_end_row >= last_unchanged_at_beg_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9946
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9947 /* If this is a continuation line, move forward to the next one
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9948 that isn't. Changes in lines above affect this line.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9949 Caution: this may move first_unchanged_at_end_row to a row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9950 not displaying text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9951 while (MATRIX_ROW_CONTINUATION_LINE_P (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9952 && MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9953 && (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9954 < it.last_visible_y))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9955 ++first_unchanged_at_end_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9956
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9957 if (!MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9958 || (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9959 >= it.last_visible_y))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9960 first_unchanged_at_end_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9961 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9962 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9963 stop_pos = (MATRIX_ROW_START_CHARPOS (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9964 + delta);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9965 first_unchanged_at_end_vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9966 = MATRIX_ROW_VPOS (first_unchanged_at_end_row, current_matrix);
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9967 xassert (stop_pos >= Z - END_UNCHANGED);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9968 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9969 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9970 else if (last_unchanged_at_beg_row == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9971 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9972
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9973
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9974 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9975
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9976 /* Either there is no unchanged row at the end, or the one we have
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9977 now displays text. This is a necessary condition for the window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9978 end pos calculation at the end of this function. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9979 xassert (first_unchanged_at_end_row == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9980 || MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9981
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9982 debug_last_unchanged_at_beg_vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9983 = (last_unchanged_at_beg_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9984 ? MATRIX_ROW_VPOS (last_unchanged_at_beg_row, current_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9985 : -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9986 debug_first_unchanged_at_end_vpos = first_unchanged_at_end_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9987
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9988 #endif /* GLYPH_DEBUG != 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9989
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9990
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9991 /* Display new lines. Set last_text_row to the last new line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9992 displayed which has text on it, i.e. might end up as being the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9993 line where the window_end_vpos is. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9994 w->cursor.vpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9995 last_text_row = NULL;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9996 overlay_arrow_seen = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9997 while (it.current_y < it.last_visible_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9998 && !fonts_changed_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9999 && (first_unchanged_at_end_row == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10000 || IT_CHARPOS (it) < stop_pos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10001 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10002 if (display_line (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10003 last_text_row = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10004 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10005
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10006 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10007 return -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10008
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10009
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10010 /* Compute differences in buffer positions, y-positions etc. for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10011 lines reused at the bottom of the window. Compute what we can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10012 scroll. */
25493
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10013 if (first_unchanged_at_end_row
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10014 /* No lines reused because we displayed everything up to the
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10015 bottom of the window. */
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10016 && it.current_y < it.last_visible_y)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10017 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10018 dvpos = (it.vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10019 - MATRIX_ROW_VPOS (first_unchanged_at_end_row,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10020 current_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10021 dy = it.current_y - first_unchanged_at_end_row->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10022 run.current_y = first_unchanged_at_end_row->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10023 run.desired_y = run.current_y + dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10024 run.height = it.last_visible_y - max (run.current_y, run.desired_y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10025 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10026 else
25493
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10027 {
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10028 delta = dvpos = dy = run.current_y = run.desired_y = run.height = 0;
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10029 first_unchanged_at_end_row = NULL;
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10030 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10031 IF_DEBUG (debug_dvpos = dvpos; debug_dy = dy);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10032
25394
ed9fe1a2c8ae (try_window_id): Remove typo.
Gerd Moellmann <gerd@gnu.org>
parents: 25393
diff changeset
10033
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10034 /* Find the cursor if not already found. We have to decide whether
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10035 PT will appear on this window (it sometimes doesn't, but this is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10036 not a very frequent case.) This decision has to be made before
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10037 the current matrix is altered. A value of cursor.vpos < 0 means
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10038 that PT is either in one of the lines beginning at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10039 first_unchanged_at_end_row or below the window. Don't care for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10040 lines that might be displayed later at the window end; as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10041 mentioned, this is not a frequent case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10042 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10043 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10044 /* Cursor in unchanged rows at the top? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10045 if (PT < CHARPOS (start_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10046 && last_unchanged_at_beg_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10047 {
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10048 row = row_containing_pos (w, PT,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10049 MATRIX_FIRST_TEXT_ROW (w->current_matrix),
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10050 last_unchanged_at_beg_row + 1);
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10051 xassert (row && row <= last_unchanged_at_beg_row);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10052 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10053 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10054
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10055 /* Start from first_unchanged_at_end_row looking for PT. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10056 else if (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10057 {
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10058 row = row_containing_pos (w, PT - delta,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10059 first_unchanged_at_end_row, NULL);
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10060 if (row)
25393
9aff86718a20 (try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents: 25388
diff changeset
10061 set_cursor_from_row (w, row, w->current_matrix, delta,
9aff86718a20 (try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents: 25388
diff changeset
10062 delta_bytes, dy, dvpos);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10063 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10064
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10065 /* Give up if cursor was not found. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10066 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10067 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10068 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10069 return -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10070 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10071 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10072
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10073 /* Don't let the cursor end in the scroll margins. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10074 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10075 int this_scroll_margin, cursor_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10076
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10077 this_scroll_margin = max (0, scroll_margin);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10078 this_scroll_margin = min (this_scroll_margin,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10079 XFASTINT (w->height) / 4);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10080 this_scroll_margin *= CANON_Y_UNIT (it.f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10081 cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10082
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10083 if ((w->cursor.y < this_scroll_margin
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10084 && CHARPOS (start) > BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10085 /* Don't take scroll margin into account at the bottom because
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10086 old redisplay didn't do it either. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10087 || w->cursor.y + cursor_height > it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10088 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10089 w->cursor.vpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10090 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10091 return -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10092 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10093 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10094
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10095 /* Scroll the display. Do it before changing the current matrix so
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10096 that xterm.c doesn't get confused about where the cursor glyph is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10097 found. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10098 if (dy)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10099 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10100 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10101
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10102 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10103 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10104 rif->update_window_begin_hook (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10105 rif->scroll_run_hook (w, &run);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10106 rif->update_window_end_hook (w, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10107 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10108 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10109 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10110 /* Terminal frame. In this case, dvpos gives the number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10111 lines to scroll by; dvpos < 0 means scroll up. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10112 int first_unchanged_at_end_vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10113 = MATRIX_ROW_VPOS (first_unchanged_at_end_row, w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10114 int from = XFASTINT (w->top) + first_unchanged_at_end_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10115 int end = XFASTINT (w->top) + window_internal_height (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10116
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10117 /* Perform the operation on the screen. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10118 if (dvpos > 0)
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
10119 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10120 /* Scroll last_unchanged_at_beg_row to the end of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10121 window down dvpos lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10122 set_terminal_window (end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10123
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10124 /* On dumb terminals delete dvpos lines at the end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10125 before inserting dvpos empty lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10126 if (!scroll_region_ok)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10127 ins_del_lines (end - dvpos, -dvpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10128
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10129 /* Insert dvpos empty lines in front of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10130 last_unchanged_at_beg_row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10131 ins_del_lines (from, dvpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10132 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10133 else if (dvpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10134 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10135 /* Scroll up last_unchanged_at_beg_vpos to the end of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10136 the window to last_unchanged_at_beg_vpos - |dvpos|. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10137 set_terminal_window (end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10138
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10139 /* Delete dvpos lines in front of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10140 last_unchanged_at_beg_vpos. ins_del_lines will set
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10141 the cursor to the given vpos and emit |dvpos| delete
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10142 line sequences. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10143 ins_del_lines (from + dvpos, dvpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10144
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10145 /* On a dumb terminal insert dvpos empty lines at the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10146 end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10147 if (!scroll_region_ok)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10148 ins_del_lines (end + dvpos, -dvpos);
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
10149 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10150
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10151 set_terminal_window (0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10152 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10153
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10154 update_end (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10155 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10156
25493
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10157 /* Shift reused rows of the current matrix to the right position.
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10158 BOTTOM_ROW is the last + 1 row in the current matrix reserved for
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10159 text. */
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10160 bottom_row = MATRIX_BOTTOM_TEXT_ROW (current_matrix, w);
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10161 bottom_vpos = MATRIX_ROW_VPOS (bottom_row, current_matrix);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10162 if (dvpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10163 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10164 rotate_matrix (current_matrix, first_unchanged_at_end_vpos + dvpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10165 bottom_vpos, dvpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10166 enable_glyph_matrix_rows (current_matrix, bottom_vpos + dvpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10167 bottom_vpos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10168 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10169 else if (dvpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10170 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10171 rotate_matrix (current_matrix, first_unchanged_at_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10172 bottom_vpos, dvpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10173 enable_glyph_matrix_rows (current_matrix, first_unchanged_at_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10174 first_unchanged_at_end_vpos + dvpos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10175 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10176
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10177 /* For frame-based redisplay, make sure that current frame and window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10178 matrix are in sync with respect to glyph memory. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10179 if (!FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10180 sync_frame_with_window_matrix_rows (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10181
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10182 /* Adjust buffer positions in reused rows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10183 if (delta)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10184 increment_glyph_matrix_buffer_positions (current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10185 first_unchanged_at_end_vpos + dvpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10186 bottom_vpos, delta, delta_bytes);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10187
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10188 /* Adjust Y positions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10189 if (dy)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10190 shift_glyph_matrix (w, current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10191 first_unchanged_at_end_vpos + dvpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10192 bottom_vpos, dy);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10193
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10194 if (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10195 first_unchanged_at_end_row += dvpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10196
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10197 /* If scrolling up, there may be some lines to display at the end of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10198 the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10199 last_text_row_at_end = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10200 if (dy < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10201 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10202 /* Set last_row to the glyph row in the current matrix where the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10203 window end line is found. It has been moved up or down in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10204 the matrix by dvpos. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10205 int last_vpos = XFASTINT (w->window_end_vpos) + dvpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10206 struct glyph_row *last_row = MATRIX_ROW (current_matrix, last_vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10207
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10208 /* If last_row is the window end line, it should display text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10209 xassert (last_row->displays_text_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10210
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10211 /* If window end line was partially visible before, begin
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10212 displaying at that line. Otherwise begin displaying with the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10213 line following it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10214 if (MATRIX_ROW_BOTTOM_Y (last_row) - dy >= it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10215 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10216 init_to_row_start (&it, w, last_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10217 it.vpos = last_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10218 it.current_y = last_row->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10219 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10220 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10221 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10222 init_to_row_end (&it, w, last_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10223 it.vpos = 1 + last_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10224 it.current_y = MATRIX_ROW_BOTTOM_Y (last_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10225 ++last_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10226 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10227
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10228 /* We may start in a continuation line. If so, we have to get
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10229 the right continuation_lines_width and current_x. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10230 it.continuation_lines_width = last_row->continuation_lines_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10231 it.hpos = it.current_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10232
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10233 /* Display the rest of the lines at the window end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10234 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10235 while (it.current_y < it.last_visible_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10236 && !fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10237 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10238 /* Is it always sure that the display agrees with lines in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10239 the current matrix? I don't think so, so we mark rows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10240 displayed invalid in the current matrix by setting their
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10241 enabled_p flag to zero. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10242 MATRIX_ROW (w->current_matrix, it.vpos)->enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10243 if (display_line (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10244 last_text_row_at_end = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10245 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10246 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10247
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10248 /* Update window_end_pos and window_end_vpos. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10249 if (first_unchanged_at_end_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10250 && first_unchanged_at_end_row->y < it.last_visible_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10251 && !last_text_row_at_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10252 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10253 /* Window end line if one of the preserved rows from the current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10254 matrix. Set row to the last row displaying text in current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10255 matrix starting at first_unchanged_at_end_row, after
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10256 scrolling. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10257 xassert (first_unchanged_at_end_row->displays_text_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10258 row = find_last_row_displaying_text (w->current_matrix, &it,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10259 first_unchanged_at_end_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10260 xassert (row && MATRIX_ROW_DISPLAYS_TEXT_P (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10261
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10262 XSETFASTINT (w->window_end_pos, Z - MATRIX_ROW_END_CHARPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10263 w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10264 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10265 MATRIX_ROW_VPOS (row, w->current_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10266 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10267 else if (last_text_row_at_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10268 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10269 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10270 Z - MATRIX_ROW_END_CHARPOS (last_text_row_at_end));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10271 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10272 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row_at_end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10273 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10274 MATRIX_ROW_VPOS (last_text_row_at_end, desired_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10275 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10276 else if (last_text_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10277 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10278 /* We have displayed either to the end of the window or at the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10279 end of the window, i.e. the last row with text is to be found
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10280 in the desired matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10281 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10282 Z - MATRIX_ROW_END_CHARPOS (last_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10283 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10284 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10285 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10286 MATRIX_ROW_VPOS (last_text_row, desired_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10287 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10288 else if (first_unchanged_at_end_row == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10289 && last_text_row == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10290 && last_text_row_at_end == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10291 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10292 /* Displayed to end of window, but no line containing text was
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10293 displayed. Lines were deleted at the end of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10294 int vpos;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10295 int header_line_p = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10296
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10297 for (vpos = XFASTINT (w->window_end_vpos); vpos > 0; --vpos)
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10298 if ((w->desired_matrix->rows[vpos + header_line_p].enabled_p
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10299 && w->desired_matrix->rows[vpos + header_line_p].displays_text_p)
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10300 || (!w->desired_matrix->rows[vpos + header_line_p].enabled_p
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10301 && w->current_matrix->rows[vpos + header_line_p].displays_text_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10302 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10303
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10304 w->window_end_vpos = make_number (vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10305 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10306 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10307 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10308
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10309 IF_DEBUG (debug_end_pos = XFASTINT (w->window_end_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10310 debug_end_vpos = XFASTINT (w->window_end_vpos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10311
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10312 /* Record that display has not been completed. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10313 w->window_end_valid = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10314 w->desired_matrix->no_scrolling_p = 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10315 return 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10316 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10317
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10318
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10319
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10320 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10321 More debugging support
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10322 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10323
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10324 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10325
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10326 void dump_glyph_row P_ ((struct glyph_matrix *, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10327 static void dump_glyph_matrix P_ ((struct glyph_matrix *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10328
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10329
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10330 /* Dump the contents of glyph matrix MATRIX on stderr. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10331 WITH_GLYPHS_P is non-zero, dump glyph contents as well. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10332
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10333 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10334 dump_glyph_matrix (matrix, with_glyphs_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10335 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10336 int with_glyphs_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10337 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10338 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10339 for (i = 0; i < matrix->nrows; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10340 dump_glyph_row (matrix, i, with_glyphs_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10341 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10342
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10343
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10344 /* Dump the contents of glyph row at VPOS in MATRIX to stderr.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10345 WITH_GLYPH_SP non-zero means dump glyph contents, too. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10346
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10347 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10348 dump_glyph_row (matrix, vpos, with_glyphs_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10349 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10350 int vpos, with_glyphs_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10351 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10352 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10353
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10354 if (vpos < 0 || vpos >= matrix->nrows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10355 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10356
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10357 row = MATRIX_ROW (matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10358
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10359 fprintf (stderr, "Row Start End Used oEI><O\\CTZF X Y W\n");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10360 fprintf (stderr, "=============================================\n");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10361
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10362 fprintf (stderr, "%3d %5d %5d %4d %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d %4d %4d %4d\n",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10363 row - matrix->rows,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10364 MATRIX_ROW_START_CHARPOS (row),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10365 MATRIX_ROW_END_CHARPOS (row),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10366 row->used[TEXT_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10367 row->contains_overlapping_glyphs_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10368 row->enabled_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10369 row->inverse_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10370 row->truncated_on_left_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10371 row->truncated_on_right_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10372 row->overlay_arrow_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10373 row->continued_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10374 MATRIX_ROW_CONTINUATION_LINE_P (row),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10375 row->displays_text_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10376 row->ends_at_zv_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10377 row->fill_line_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10378 row->x,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10379 row->y,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10380 row->pixel_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10381 fprintf (stderr, "%9d %5d\n", row->start.overlay_string_index,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10382 row->end.overlay_string_index);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10383 fprintf (stderr, "%9d %5d\n",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10384 CHARPOS (row->start.string_pos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10385 CHARPOS (row->end.string_pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10386 fprintf (stderr, "%9d %5d\n", row->start.dpvec_index,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10387 row->end.dpvec_index);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10388
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10389 if (with_glyphs_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10390 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10391 struct glyph *glyph, *glyph_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10392 int prev_had_glyphs_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10393
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10394 glyph = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10395 glyph_end = glyph + row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10396
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10397 /* Glyph for a line end in text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10398 if (glyph == glyph_end && glyph->charpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10399 ++glyph_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10400
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10401 if (glyph < glyph_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10402 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10403 fprintf (stderr, " Glyph Type Pos W Code C Face LR\n");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10404 prev_had_glyphs_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10405 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10406 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10407 prev_had_glyphs_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10408
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10409 while (glyph < glyph_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10410 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10411 if (glyph->type == CHAR_GLYPH)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10412 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10413 fprintf (stderr,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10414 " %5d %4c %6d %3d 0x%05x %c %4d %1.1d%1.1d\n",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10415 glyph - row->glyphs[TEXT_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10416 'C',
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10417 glyph->charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10418 glyph->pixel_width,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10419 glyph->u.ch.code,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10420 (glyph->u.ch.code < 0x80 && glyph->u.ch.code >= ' '
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10421 ? glyph->u.ch.code
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10422 : '.'),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10423 glyph->u.ch.face_id,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10424 glyph->left_box_line_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10425 glyph->right_box_line_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10426 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10427 else if (glyph->type == STRETCH_GLYPH)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10428 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10429 fprintf (stderr,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10430 " %5d %4c %6d %3d 0x%05x %c %4d %1.1d%1.1d\n",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10431 glyph - row->glyphs[TEXT_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10432 'S',
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10433 glyph->charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10434 glyph->pixel_width,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10435 0,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10436 '.',
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10437 glyph->u.stretch.face_id,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10438 glyph->left_box_line_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10439 glyph->right_box_line_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10440 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10441 else if (glyph->type == IMAGE_GLYPH)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10442 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10443 fprintf (stderr,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10444 " %5d %4c %6d %3d 0x%05x %c %4d %1.1d%1.1d\n",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10445 glyph - row->glyphs[TEXT_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10446 'I',
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10447 glyph->charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10448 glyph->pixel_width,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10449 glyph->u.img.id,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10450 '.',
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10451 glyph->u.img.face_id,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10452 glyph->left_box_line_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10453 glyph->right_box_line_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10454 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10455 ++glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10456 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10457 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10458 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10459
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10460
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10461 DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10462 Sdump_glyph_matrix, 0, 1, "p",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10463 "Dump the current matrix of the selected window to stderr.\n\
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10464 Shows contents of glyph row structures. With non-nil optional\n\
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10465 parameter WITH-GLYPHS-P, dump glyphs as well.")
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10466 (with_glyphs_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10467 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10468 struct window *w = XWINDOW (selected_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10469 struct buffer *buffer = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10470
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10471 fprintf (stderr, "PT = %d, BEGV = %d. ZV = %d\n",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10472 BUF_PT (buffer), BUF_BEGV (buffer), BUF_ZV (buffer));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10473 fprintf (stderr, "Cursor x = %d, y = %d, hpos = %d, vpos = %d\n",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10474 w->cursor.x, w->cursor.y, w->cursor.hpos, w->cursor.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10475 fprintf (stderr, "=============================================\n");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10476 dump_glyph_matrix (w->current_matrix, !NILP (with_glyphs_p));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10477 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10478 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10479
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10480
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10481 DEFUN ("dump-glyph-row", Fdump_glyph_row, Sdump_glyph_row, 1, 1, "",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10482 "Dump glyph row ROW to stderr.")
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10483 (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10484 Lisp_Object row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10485 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10486 CHECK_NUMBER (row, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10487 dump_glyph_row (XWINDOW (selected_window)->current_matrix, XINT (row), 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10488 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10489 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10490
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10491
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10492 DEFUN ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10493 0, 0, "", "")
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10494 ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10495 {
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
10496 struct frame *sf = SELECTED_FRAME ();
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
10497 struct glyph_matrix *m = (XWINDOW (sf->tool_bar_window)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10498 ->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10499 dump_glyph_row (m, 0, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10500 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10501 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10502
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10503
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10504 DEFUN ("trace-redisplay-toggle", Ftrace_redisplay_toggle,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10505 Strace_redisplay_toggle, 0, 0, "",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10506 "Toggle tracing of redisplay.")
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10507 ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10508 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10509 trace_redisplay_p = !trace_redisplay_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10510 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10511 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10512
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10513
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10514 #endif /* GLYPH_DEBUG */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10515
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10516
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10517
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10518 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10519 Building Desired Matrix Rows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10520 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10521
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10522 /* Return a temporary glyph row holding the glyphs of an overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10523 arrow. Only used for non-window-redisplay windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10524
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10525 static struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10526 get_overlay_arrow_glyph_row (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10527 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10528 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10529 struct frame *f = XFRAME (WINDOW_FRAME (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10530 struct buffer *buffer = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10531 struct buffer *old = current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10532 unsigned char *arrow_string = XSTRING (Voverlay_arrow_string)->data;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10533 int arrow_len = XSTRING (Voverlay_arrow_string)->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10534 unsigned char *arrow_end = arrow_string + arrow_len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10535 unsigned char *p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10536 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10537 int multibyte_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10538 int n_glyphs_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10539
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10540 set_buffer_temp (buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10541 init_iterator (&it, w, -1, -1, &scratch_glyph_row, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10542 it.glyph_row->used[TEXT_AREA] = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10543 SET_TEXT_POS (it.position, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10544
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10545 multibyte_p = !NILP (buffer->enable_multibyte_characters);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10546 p = arrow_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10547 while (p < arrow_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10548 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10549 Lisp_Object face, ilisp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10550
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10551 /* Get the next character. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10552 if (multibyte_p)
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
10553 it.c = string_char_and_length (p, arrow_len, &it.len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10554 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10555 it.c = *p, it.len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10556 p += it.len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10557
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10558 /* Get its face. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10559 XSETFASTINT (ilisp, p - arrow_string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10560 face = Fget_text_property (ilisp, Qface, Voverlay_arrow_string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10561 it.face_id = compute_char_face (f, it.c, face);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10562
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10563 /* Compute its width, get its glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10564 n_glyphs_before = it.glyph_row->used[TEXT_AREA];
25243
d74ff22998b4 (get_overlay_arrow_glyph_row): Set the charpos of
Gerd Moellmann <gerd@gnu.org>
parents: 25242
diff changeset
10565 SET_TEXT_POS (it.position, -1, -1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10566 PRODUCE_GLYPHS (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10567
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10568 /* If this character doesn't fit any more in the line, we have
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10569 to remove some glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10570 if (it.current_x > it.last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10571 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10572 it.glyph_row->used[TEXT_AREA] = n_glyphs_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10573 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10574 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10575 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10576
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10577 set_buffer_temp (old);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10578 return it.glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10579 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10580
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10581
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10582 /* Insert truncation glyphs at the start of IT->glyph_row. Truncation
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10583 glyphs are only inserted for terminal frames since we can't really
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10584 win with truncation glyphs when partially visible glyphs are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10585 involved. Which glyphs to insert is determined by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10586 produce_special_glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10587
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10588 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10589 insert_left_trunc_glyphs (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10590 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10591 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10592 struct it truncate_it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10593 struct glyph *from, *end, *to, *toend;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10594
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10595 xassert (!FRAME_WINDOW_P (it->f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10596
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10597 /* Get the truncation glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10598 truncate_it = *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10599 truncate_it.charset = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10600 truncate_it.current_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10601 truncate_it.face_id = DEFAULT_FACE_ID;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10602 truncate_it.glyph_row = &scratch_glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10603 truncate_it.glyph_row->used[TEXT_AREA] = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10604 CHARPOS (truncate_it.position) = BYTEPOS (truncate_it.position) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10605 truncate_it.object = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10606 produce_special_glyphs (&truncate_it, IT_TRUNCATION);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10607
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10608 /* Overwrite glyphs from IT with truncation glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10609 from = truncate_it.glyph_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10610 end = from + truncate_it.glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10611 to = it->glyph_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10612 toend = to + it->glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10613
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10614 while (from < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10615 *to++ = *from++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10616
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10617 /* There may be padding glyphs left over. Remove them. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10618 from = to;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10619 while (from < toend && CHAR_GLYPH_PADDING_P (*from))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10620 ++from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10621 while (from < toend)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10622 *to++ = *from++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10623
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10624 it->glyph_row->used[TEXT_AREA] = to - it->glyph_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10625 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10626
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10627
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10628 /* Compute the pixel height and width of IT->glyph_row.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10629
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10630 Most of the time, ascent and height of a display line will be equal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10631 to the max_ascent and max_height values of the display iterator
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10632 structure. This is not the case if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10633
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10634 1. We hit ZV without displaying anything. In this case, max_ascent
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10635 and max_height will be zero.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10636
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10637 2. We have some glyphs that don't contribute to the line height.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10638 (The glyph row flag contributes_to_line_height_p is for future
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10639 pixmap extensions).
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10640
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10641 The first case is easily covered by using default values because in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10642 these cases, the line height does not really matter, except that it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10643 must not be zero. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10644
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10645 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10646 compute_line_metrics (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10647 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10648 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10649 struct glyph_row *row = it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10650 int area, i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10651
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10652 if (FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10653 {
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10654 int i, header_line_height;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10655
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10656 /* The line may consist of one space only, that was added to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10657 place the cursor on it. If so, the row's height hasn't been
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10658 computed yet. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10659 if (row->height == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10660 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10661 if (it->max_ascent + it->max_descent == 0)
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10662 it->max_descent = it->max_phys_descent = CANON_Y_UNIT (it->f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10663 row->ascent = it->max_ascent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10664 row->height = it->max_ascent + it->max_descent;
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10665 row->phys_ascent = it->max_phys_ascent;
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10666 row->phys_height = it->max_phys_ascent + it->max_phys_descent;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10667 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10668
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10669 /* Compute the width of this line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10670 row->pixel_width = row->x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10671 for (i = 0; i < row->used[TEXT_AREA]; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10672 row->pixel_width += row->glyphs[TEXT_AREA][i].pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10673
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10674 xassert (row->pixel_width >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10675 xassert (row->ascent >= 0 && row->height > 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10676
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10677 row->overlapping_p = (MATRIX_ROW_OVERLAPS_SUCC_P (row)
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10678 || MATRIX_ROW_OVERLAPS_PRED_P (row));
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10679
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10680 /* If first line's physical ascent is larger than its logical
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10681 ascent, use the physical ascent, and make the row taller.
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10682 This makes accented characters fully visible. */
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10683 if (row == it->w->desired_matrix->rows
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10684 && row->phys_ascent > row->ascent)
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10685 {
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10686 row->height += row->phys_ascent - row->ascent;
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10687 row->ascent = row->phys_ascent;
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10688 }
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10689
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10690 /* Compute how much of the line is visible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10691 row->visible_height = row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10692
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10693 header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (it->w);
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10694 if (row->y < header_line_height)
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10695 row->visible_height -= header_line_height - row->y;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10696 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10697 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10698 int max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (it->w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10699 if (row->y + row->height > max_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10700 row->visible_height -= row->y + row->height - max_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10701 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10702 }
6415
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
10703 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10704 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10705 row->pixel_width = row->used[TEXT_AREA];
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10706 row->ascent = row->phys_ascent = 0;
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10707 row->height = row->phys_height = row->visible_height = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10708 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10709
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10710 /* Compute a hash code for this row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10711 row->hash = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10712 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10713 for (i = 0; i < row->used[area]; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10714 row->hash = ((((row->hash << 4) + (row->hash >> 24)) & 0x0fffffff)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10715 + row->glyphs[area][i].u.val
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10716 + (row->glyphs[area][i].type << 2));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10717
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10718 it->max_ascent = it->max_descent = 0;
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10719 it->max_phys_ascent = it->max_phys_descent = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10720 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10721
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10722
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10723 /* Append one space to the glyph row of iterator IT if doing a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10724 window-based redisplay. DEFAULT_FACE_P non-zero means let the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10725 space have the default face, otherwise let it have the same face as
26255
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
10726 IT->face_id. Value is non-zero if a space was added.
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
10727
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
10728 This function is called to make sure that there is always one glyph
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
10729 at the end of a glyph row that the cursor can be set on under
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
10730 window-systems. (If there weren't such a glyph we would not know
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
10731 how wide and tall a box cursor should be displayed).
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
10732
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
10733 At the same time this space let's a nicely handle clearing to the
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
10734 end of the line if the row ends in italic text. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10735
26255
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
10736 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10737 append_space (it, default_face_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10738 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10739 int default_face_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10740 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10741 if (FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10742 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10743 int n = it->glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10744
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10745 if (it->glyph_row->glyphs[TEXT_AREA] + n
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10746 < it->glyph_row->glyphs[1 + TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10747 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10748 /* Save some values that must not be changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10749 int saved_x = it->current_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10750 struct text_pos saved_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10751 int saved_what = it->what;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10752 int saved_face_id = it->face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10753 int saved_charset = it->charset;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10754 Lisp_Object saved_object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10755
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10756 saved_object = it->object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10757 saved_pos = it->position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10758
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10759 it->what = IT_CHARACTER;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10760 bzero (&it->position, sizeof it->position);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10761 it->object = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10762 it->c = ' ';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10763 it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10764 it->charset = CHARSET_ASCII;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10765
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10766 if (default_face_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10767 it->face_id = DEFAULT_FACE_ID;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10768 if (it->multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10769 it->face_id = FACE_FOR_CHARSET (it->f, it->face_id, CHARSET_ASCII);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10770 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10771 it->face_id = FACE_FOR_CHARSET (it->f, it->face_id, -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10772
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10773 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10774
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10775 it->current_x = saved_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10776 it->object = saved_object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10777 it->position = saved_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10778 it->what = saved_what;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10779 it->face_id = saved_face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10780 it->charset = saved_charset;
26255
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
10781 return 1;
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
10782 }
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
10783 }
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
10784
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
10785 return 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10786 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10787
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10788
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10789 /* Extend the face of the last glyph in the text area of IT->glyph_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10790 to the end of the display line. Called from display_line.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10791 If the glyph row is empty, add a space glyph to it so that we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10792 know the face to draw. Set the glyph row flag fill_line_p. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10793
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10794 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10795 extend_face_to_end_of_line (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10796 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10797 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10798 struct face *face;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10799 struct frame *f = it->f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10800
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10801 /* If line is already filled, do nothing. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10802 if (it->current_x >= it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10803 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10804
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10805 /* Face extension extends the background and box of IT->face_id
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10806 to the end of the line. If the background equals the background
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10807 of the frame, we haven't to do anything. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10808 face = FACE_FROM_ID (f, it->face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10809 if (FRAME_WINDOW_P (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10810 && face->box == FACE_NO_BOX
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10811 && face->background == FRAME_BACKGROUND_PIXEL (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10812 && !face->stipple)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10813 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10814
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10815 /* Set the glyph row flag indicating that the face of the last glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10816 in the text area has to be drawn to the end of the text area. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10817 it->glyph_row->fill_line_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10818
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10819 /* If current charset of IT is not ASCII, make sure we have the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10820 ASCII face. This will be automatically undone the next time
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10821 get_next_display_element returns a character from a different
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10822 charset. Note that the charset will always be ASCII in unibyte
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10823 text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10824 if (it->charset != CHARSET_ASCII)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10825 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10826 it->charset = CHARSET_ASCII;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10827 it->face_id = FACE_FOR_CHARSET (f, it->face_id, CHARSET_ASCII);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10828 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10829
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10830 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10831 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10832 /* If the row is empty, add a space with the current face of IT,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10833 so that we know which face to draw. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10834 if (it->glyph_row->used[TEXT_AREA] == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10835 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10836 it->glyph_row->glyphs[TEXT_AREA][0] = space_glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10837 it->glyph_row->glyphs[TEXT_AREA][0].u.ch.face_id = it->face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10838 it->glyph_row->used[TEXT_AREA] = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10839 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10840 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10841 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10842 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10843 /* Save some values that must not be changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10844 int saved_x = it->current_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10845 struct text_pos saved_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10846 Lisp_Object saved_object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10847 int saved_what = it->what;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10848
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10849 saved_object = it->object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10850 saved_pos = it->position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10851
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10852 it->what = IT_CHARACTER;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10853 bzero (&it->position, sizeof it->position);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10854 it->object = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10855 it->c = ' ';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10856 it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10857
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10858 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10859
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10860 while (it->current_x <= it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10861 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10862
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10863 /* Don't count these blanks really. It would let us insert a left
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10864 truncation glyph below and make us set the cursor on them, maybe. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10865 it->current_x = saved_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10866 it->object = saved_object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10867 it->position = saved_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10868 it->what = saved_what;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10869 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10870 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10871
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10872
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10873 /* Value is non-zero if text starting at CHARPOS in current_buffer is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10874 trailing whitespace. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
10875
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
10876 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10877 trailing_whitespace_p (charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10878 int charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10879 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10880 int bytepos = CHAR_TO_BYTE (charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10881 int c = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10882
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10883 while (bytepos < ZV_BYTE
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10884 && (c = FETCH_CHAR (bytepos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10885 c == ' ' || c == '\t'))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10886 ++bytepos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10887
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
10888 if (bytepos >= ZV_BYTE || c == '\n' || c == '\r')
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
10889 {
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
10890 if (bytepos != PT_BYTE)
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
10891 return 1;
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
10892 }
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
10893 return 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10894 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10895
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10896
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10897 /* Highlight trailing whitespace, if any, in ROW. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10898
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10899 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10900 highlight_trailing_whitespace (f, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10901 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10902 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10903 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10904 int used = row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10905
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10906 if (used)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10907 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10908 struct glyph *start = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10909 struct glyph *glyph = start + used - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10910
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10911 /* Skip over the space glyph inserted to display the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10912 cursor at the end of a line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10913 if (glyph->type == CHAR_GLYPH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10914 && glyph->u.ch.code == ' '
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10915 && glyph->object == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10916 --glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10917
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10918 /* If last glyph is a space or stretch, and it's trailing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10919 whitespace, set the face of all trailing whitespace glyphs in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10920 IT->glyph_row to `trailing-whitespace'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10921 if (glyph >= start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10922 && BUFFERP (glyph->object)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10923 && (glyph->type == STRETCH_GLYPH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10924 || (glyph->type == CHAR_GLYPH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10925 && glyph->u.ch.code == ' '))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10926 && trailing_whitespace_p (glyph->charpos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10927 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10928 int face_id = lookup_named_face (f, Qtrailing_whitespace,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10929 CHARSET_ASCII);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10930
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10931 while (glyph >= start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10932 && BUFFERP (glyph->object)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10933 && (glyph->type == STRETCH_GLYPH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10934 || (glyph->type == CHAR_GLYPH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10935 && glyph->u.ch.code == ' ')))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10936 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10937 if (glyph->type == STRETCH_GLYPH)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10938 glyph->u.stretch.face_id = face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10939 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10940 glyph->u.ch.face_id = face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10941 --glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10942 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10943 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10944 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10945 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10946
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10947
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10948 /* Construct the glyph row IT->glyph_row in the desired matrix of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10949 IT->w from text at the current position of IT. See dispextern.h
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10950 for an overview of struct it. Value is non-zero if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10951 IT->glyph_row displays text, as opposed to a line displaying ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10952 only. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10953
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10954 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10955 display_line (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10956 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10957 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10958 struct glyph_row *row = it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10959
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10960 /* We always start displaying at hpos zero even if hscrolled. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10961 xassert (it->hpos == 0 && it->current_x == 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10962
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10963 /* We must not display in a row that's not a text row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10964 xassert (MATRIX_ROW_VPOS (row, it->w->desired_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10965 < it->w->desired_matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10966
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10967 /* Is IT->w showing the region? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10968 it->w->region_showing = it->region_beg_charpos > 0 ? Qt : Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10969
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10970 /* Clear the result glyph row and enable it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10971 prepare_desired_row (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10972
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10973 row->y = it->current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10974 row->start = it->current;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10975 row->continuation_lines_width = it->continuation_lines_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10976 row->displays_text_p = 1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10977
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
10978 /* Arrange the overlays nicely for our purposes. Usually, we call
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10979 display_line on only one line at a time, in which case this
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
10980 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
10981 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
10982 recenter_overlay_lists but the first will be pretty cheap. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10983 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10984
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10985 /* Move over display elements that are not visible because we are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10986 hscrolled. This may stop at an x-position < IT->first_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10987 if the first glyph is partially visible or if we hit a line end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10988 if (it->current_x < it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10989 move_it_in_display_line_to (it, ZV, it->first_visible_x,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10990 MOVE_TO_POS | MOVE_TO_X);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10991
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10992 /* Get the initial row height. This is either the height of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10993 text hscrolled, if there is any, or zero. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10994 row->ascent = it->max_ascent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10995 row->height = it->max_ascent + it->max_descent;
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10996 row->phys_ascent = it->max_phys_ascent;
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
10997 row->phys_height = it->max_phys_ascent + it->max_phys_descent;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10998
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10999 /* Loop generating characters. The loop is left with IT on the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11000 character to display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11001 while (1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11002 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11003 int n_glyphs_before, hpos_before, x_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11004 int x, i, nglyphs;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11005
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11006 /* Retrieve the next thing to display. Value is zero if end of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11007 buffer reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11008 if (!get_next_display_element (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11009 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11010 /* Maybe add a space at the end of this line that is used to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11011 display the cursor there under X. */
26255
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11012 if (append_space (it, 1) && row->used[TEXT_AREA] == 1)
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11013 {
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11014 /* The position -1 below indicates a blank line not
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11015 corresponding to any text, as opposed to an empty line
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11016 corresponding to a line end. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11017 row->glyphs[TEXT_AREA]->charpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11018 row->displays_text_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11019
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11020 if (!NILP (XBUFFER (it->w->buffer)->indicate_empty_lines))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11021 row->indicate_empty_line_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11022 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11023
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11024 it->continuation_lines_width = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11025 row->ends_at_zv_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11026 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11027 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11028
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11029 /* Now, get the metrics of what we want to display. This also
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11030 generates glyphs in `row' (which is IT->glyph_row). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11031 n_glyphs_before = row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11032 x = it->current_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11033 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11034
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11035 /* If this display element was in marginal areas, continue with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11036 the next one. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11037 if (it->area != TEXT_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11038 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11039 row->ascent = max (row->ascent, it->max_ascent);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11040 row->height = max (row->height, it->max_ascent + it->max_descent);
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11041 row->phys_ascent = max (row->phys_ascent, it->max_phys_ascent);
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11042 row->phys_height = max (row->phys_height,
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11043 it->max_phys_ascent + it->max_phys_descent);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11044 set_iterator_to_next (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11045 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11046 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11047
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11048 /* Does the display element fit on the line? If we truncate
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11049 lines, we should draw past the right edge of the window. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11050 we don't truncate, we want to stop so that we can display the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11051 continuation glyph before the right margin. If lines are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11052 continued, there are two possible strategies for characters
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11053 resulting in more than 1 glyph (e.g. tabs): Display as many
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11054 glyphs as possible in this line and leave the rest for the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11055 continuation line, or display the whole element in the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11056 line. Original redisplay did the former, so we do it also. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11057 nglyphs = row->used[TEXT_AREA] - n_glyphs_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11058 hpos_before = it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11059 x_before = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11060
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11061 if (nglyphs == 1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11062 && it->current_x < it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11063 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11064 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11065 row->ascent = max (row->ascent, it->max_ascent);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11066 row->height = max (row->height, it->max_ascent + it->max_descent);
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11067 row->phys_ascent = max (row->phys_ascent, it->max_phys_ascent);
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11068 row->phys_height = max (row->phys_height,
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11069 it->max_phys_ascent + it->max_phys_descent);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11070 if (it->current_x - it->pixel_width < it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11071 row->x = x - it->first_visible_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11072 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11073 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11074 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11075 int new_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11076 struct glyph *glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11077
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11078 for (i = 0; i < nglyphs; ++i, x = new_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11079 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11080 glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11081 new_x = x + glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11082
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11083 if (/* Lines are continued. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11084 !it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11085 && (/* Glyph doesn't fit on the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11086 new_x > it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11087 /* Or it fits exactly on a window system frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11088 || (new_x == it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11089 && FRAME_WINDOW_P (it->f))))
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
11090 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11091 /* End of a continued line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11092
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11093 if (it->hpos == 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11094 || (new_x == it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11095 && FRAME_WINDOW_P (it->f)))
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
11096 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11097 /* Current glyph fits exactly on the line. We
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11098 must continue the line because we can't draw
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11099 the cursor after the glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11100 row->continued_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11101 it->current_x = new_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11102 it->continuation_lines_width += new_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11103 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11104 if (i == nglyphs - 1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11105 set_iterator_to_next (it);
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
11106 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11107 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11108 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11109 /* Display element draws past the right edge of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11110 the window. Restore positions to values
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11111 before the element. The next line starts
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11112 with current_x before the glyph that could
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11113 not be displayed, so that TAB works right. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11114 row->used[TEXT_AREA] = n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11115
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11116 /* Display continuation glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11117 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11118 produce_special_glyphs (it, IT_CONTINUATION);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11119 row->continued_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11120
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11121 it->current_x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11122 it->continuation_lines_width += x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11123 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11124 break;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
11125 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11126 else if (new_x > it->first_visible_x)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11127 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11128 /* Increment number of glyphs actually displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11129 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11130
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11131 if (x < it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11132 /* Glyph is partially visible, i.e. row starts at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11133 negative X position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11134 row->x = x - it->first_visible_x;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11135 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11136 else
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
11137 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11138 /* Glyph is completely off the left margin of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11139 window. This should not happen because of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11140 move_it_in_display_line at the start of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11141 this function. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11142 abort ();
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
11143 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
11144 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11145
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11146 row->ascent = max (row->ascent, it->max_ascent);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11147 row->height = max (row->height, it->max_ascent + it->max_descent);
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11148 row->phys_ascent = max (row->phys_ascent, it->max_phys_ascent);
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11149 row->phys_height = max (row->phys_height,
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11150 it->max_phys_ascent + it->max_phys_descent);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11151
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11152 /* End of this display line if row is continued. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11153 if (row->continued_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11154 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11155 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11156
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11157 /* Is this a line end? If yes, we're also done, after making
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11158 sure that a non-default face is extended up to the right
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11159 margin of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11160 if (ITERATOR_AT_END_OF_LINE_P (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11161 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11162 int used_before = row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11163
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11164 /* Add a space at the end of the line that is used to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11165 display the cursor there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11166 append_space (it, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11167
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11168 /* Extend the face to the end of the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11169 extend_face_to_end_of_line (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11170
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11171 /* Make sure we have the position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11172 if (used_before == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11173 row->glyphs[TEXT_AREA]->charpos = CHARPOS (it->position);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11174
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11175 /* Consume the line end. This skips over invisible lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11176 set_iterator_to_next (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11177 it->continuation_lines_width = 0;
2754
af06c054b48f (display_text_line): Use break; to exit loop at eol.
Richard M. Stallman <rms@gnu.org>
parents: 2742
diff changeset
11178 break;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11179 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11180
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11181 /* Proceed with next display element. Note that this skips
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11182 over lines invisible because of selective display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11183 set_iterator_to_next (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11184
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11185 /* If we truncate lines, we are done when the last displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11186 glyphs reach past the right margin of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11187 if (it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11188 && (FRAME_WINDOW_P (it->f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11189 ? (it->current_x >= it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11190 : (it->current_x > it->last_visible_x)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11191 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11192 /* Maybe add truncation glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11193 if (!FRAME_WINDOW_P (it->f))
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11194 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11195 --it->glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11196 produce_special_glyphs (it, IT_TRUNCATION);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11197 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11198
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11199 row->truncated_on_right_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11200 it->continuation_lines_width = 0;
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11201 reseat_at_next_visible_line_start (it, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11202 row->ends_at_zv_p = FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11203 it->hpos = hpos_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11204 it->current_x = x_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11205 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11206 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11207 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11208
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11209 /* If line is not empty and hscrolled, maybe insert truncation glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11210 at the left window margin. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11211 if (it->first_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11212 && IT_CHARPOS (*it) != MATRIX_ROW_START_CHARPOS (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11213 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11214 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11215 insert_left_trunc_glyphs (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11216 row->truncated_on_left_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11217 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11218
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11219 /* If the start of this line is the overlay arrow-position, then
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11220 mark this glyph row as the one containing the overlay arrow.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11221 This is clearly a mess with variable size fonts. It would be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11222 better to let it be displayed like cursors under X. */
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
11223 if (MARKERP (Voverlay_arrow_position)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11224 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11225 && (MATRIX_ROW_START_CHARPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11226 == marker_position (Voverlay_arrow_position))
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
11227 && STRINGP (Voverlay_arrow_string)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11228 && ! overlay_arrow_seen)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11229 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11230 /* Overlay arrow in window redisplay is a bitmap. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11231 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11232 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11233 struct glyph_row *arrow_row = get_overlay_arrow_glyph_row (it->w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11234 struct glyph *glyph = arrow_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11235 struct glyph *arrow_end = glyph + arrow_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11236 struct glyph *p = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11237 struct glyph *p2, *end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11238
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11239 /* Copy the arrow glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11240 while (glyph < arrow_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11241 *p++ = *glyph++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11242
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11243 /* Throw away padding glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11244 p2 = p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11245 end = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11246 while (p2 < end && CHAR_GLYPH_PADDING_P (*p2))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11247 ++p2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11248 if (p2 > p)
8471
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
11249 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11250 while (p2 < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11251 *p++ = *p2++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11252 row->used[TEXT_AREA] = p2 - row->glyphs[TEXT_AREA];
8471
64c299dd51b8 (display_text_line): Use the face properties of the overlay arrow, if any.
Richard M. Stallman <rms@gnu.org>
parents: 8417
diff changeset
11253 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11254 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11255
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11256 overlay_arrow_seen = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11257 row->overlay_arrow_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11258 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11259
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11260 /* Compute pixel dimensions of this line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11261 compute_line_metrics (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11262
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11263 /* Remember the position at which this line ends. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11264 row->end = it->current;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11265
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11266 /* Maybe set the cursor. If you change this, it's probably a good
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11267 idea to also change the code in redisplay_window for cursor
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11268 movement in an unchanged window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11269 if (it->w->cursor.vpos < 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11270 && PT >= MATRIX_ROW_START_CHARPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11271 && MATRIX_ROW_END_CHARPOS (row) >= PT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11272 && !(MATRIX_ROW_END_CHARPOS (row) == PT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11273 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11274 || !row->ends_at_zv_p)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11275 set_cursor_from_row (it->w, row, it->w->desired_matrix, 0, 0, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11276
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11277 /* Highlight trailing whitespace. */
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
11278 if (!NILP (Vshow_trailing_whitespace))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11279 highlight_trailing_whitespace (it->f, it->glyph_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11280
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11281 /* Prepare for the next line. This line starts horizontally at (X
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11282 HPOS) = (0 0). Vertical positions are incremented. As a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11283 convenience for the caller, IT->glyph_row is set to the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11284 row to be used. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11285 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11286 it->current_y += row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11287 ++it->vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11288 ++it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11289 return row->displays_text_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11290 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11291
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11292
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11293
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11294 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11295 Menu Bar
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11296 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11297
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11298 /* Redisplay the menu bar in the frame for window W.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11299
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11300 The menu bar of X frames that don't have X toolkit support is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11301 displayed in a special window W->frame->menu_bar_window.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11302
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11303 The menu bar of terminal frames is treated specially as far as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11304 glyph matrices are concerned. Menu bar lines are not part of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11305 windows, so the update is done directly on the frame matrix rows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11306 for the menu bar. */
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
11307
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
11308 static void
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
11309 display_menu_bar (w)
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
11310 struct window *w;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
11311 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11312 struct frame *f = XFRAME (WINDOW_FRAME (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11313 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11314 Lisp_Object items;
6134
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
11315 int i;
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
11316
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11317 /* Don't do all this for graphical frames. */
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
11318 #ifdef HAVE_NTGUI
15245
4bfe3c580496 (display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents: 15111
diff changeset
11319 if (!NILP (Vwindow_system))
4bfe3c580496 (display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents: 15111
diff changeset
11320 return;
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
11321 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11322 #ifdef USE_X_TOOLKIT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11323 if (FRAME_X_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11324 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11325 #endif
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
11326
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
11327 #ifdef USE_X_TOOLKIT
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11328 xassert (!FRAME_WINDOW_P (f));
25882
42efd343a3f8 (display_menu_bar): Use MENU_FACE_ID instead of
Gerd Moellmann <gerd@gnu.org>
parents: 25832
diff changeset
11329 init_iterator (&it, w, -1, -1, f->desired_matrix->rows, MENU_FACE_ID);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11330 it.first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11331 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11332 #else /* not USE_X_TOOLKIT */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11333 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11334 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11335 /* Menu bar lines are displayed in the desired matrix of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11336 dummy window menu_bar_window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11337 struct window *menu_w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11338 xassert (WINDOWP (f->menu_bar_window));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11339 menu_w = XWINDOW (f->menu_bar_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11340 init_iterator (&it, menu_w, -1, -1, menu_w->desired_matrix->rows,
25882
42efd343a3f8 (display_menu_bar): Use MENU_FACE_ID instead of
Gerd Moellmann <gerd@gnu.org>
parents: 25832
diff changeset
11341 MENU_FACE_ID);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11342 it.first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11343 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11344 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11345 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11346 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11347 /* This is a TTY frame, i.e. character hpos/vpos are used as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11348 pixel x/y. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11349 init_iterator (&it, w, -1, -1, f->desired_matrix->rows,
25882
42efd343a3f8 (display_menu_bar): Use MENU_FACE_ID instead of
Gerd Moellmann <gerd@gnu.org>
parents: 25832
diff changeset
11350 MENU_FACE_ID);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11351 it.first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11352 it.last_visible_x = FRAME_WIDTH (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11353 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11354 #endif /* not USE_X_TOOLKIT */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11355
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11356 /* Clear all rows of the menu bar. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11357 for (i = 0; i < FRAME_MENU_BAR_LINES (f); ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11358 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11359 struct glyph_row *row = it.glyph_row + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11360 clear_glyph_row (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11361 row->enabled_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11362 row->full_width_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11363 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11364
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11365 /* Make the first line of the menu bar appear in reverse video. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11366 it.glyph_row->inverse_p = mode_line_inverse_video != 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11367
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11368 /* Display all items of the menu bar. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11369 items = FRAME_MENU_BAR_ITEMS (it.f);
15111
6a5ae152de0d (display_menu_bar): FRAME_MENU_BAR_ITEMS now has four elements per item.
Richard M. Stallman <rms@gnu.org>
parents: 15038
diff changeset
11370 for (i = 0; i < XVECTOR (items)->size; i += 4)
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
11371 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11372 Lisp_Object string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11373
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11374 /* Stop at nil string. */
6134
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
11375 string = XVECTOR (items)->contents[i + 1];
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
11376 if (NILP (string))
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
11377 break;
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
11378
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11379 /* Remember where item was displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11380 XSETFASTINT (XVECTOR (items)->contents[i + 3], it.hpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11381
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11382 /* Display the item, pad with one space. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11383 if (it.current_x < it.last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11384 display_string (NULL, string, Qnil, 0, 0, &it,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11385 XSTRING (string)->size + 1, 0, 0, -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11386 }
2189
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
11387
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
11388 /* Fill out the line with spaces. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11389 if (it.current_x < it.last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11390 display_string ("", Qnil, Qnil, 0, 0, &it, -1, 0, 0, -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11391
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11392 /* Compute the total height of the lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11393 compute_line_metrics (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11394 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11395
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11396
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
11397
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11398 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11399 Mode Line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11400 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11401
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11402 /* Display the mode and/or top line of window W. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11403
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11404 static void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11405 display_mode_lines (w)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11406 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11407 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11408 /* These will be set while the mode line specs are processed. */
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
11409 line_number_displayed = 0;
10441
f1fc7b6e5fa4 (redisplay, redisplay_window, display_mode_line, decode_mode_spec): Use window
Karl Heuer <kwzh@gnu.org>
parents: 10416
diff changeset
11410 w->column_number_displayed = Qnil;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
11411
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11412 if (WINDOW_WANTS_MODELINE_P (w))
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11413 display_mode_line (w, MODE_LINE_FACE_ID,
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11414 current_buffer->mode_line_format);
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11415
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11416 if (WINDOW_WANTS_HEADER_LINE_P (w))
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11417 display_mode_line (w, HEADER_LINE_FACE_ID,
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11418 current_buffer->header_line_format);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11419 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11420
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11421
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11422 /* Display mode or top line of window W. FACE_ID specifies which line
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11423 to display; it is either MODE_LINE_FACE_ID or HEADER_LINE_FACE_ID.
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11424 FORMAT is the mode line format to display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11425
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11426 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11427 display_mode_line (w, face_id, format)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11428 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11429 enum face_id face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11430 Lisp_Object format;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11431 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11432 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11433 struct face *face;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11434
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11435 init_iterator (&it, w, -1, -1, NULL, face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11436 prepare_desired_row (it.glyph_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11437
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11438 /* Temporarily make frame's keyboard the current kboard so that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11439 kboard-local variables in the mode_line_format will get the right
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11440 values. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11441 push_frame_kboard (it.f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11442 display_mode_element (&it, 0, 0, 0, format);
11354
17f7be3e2443 (display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents: 11291
diff changeset
11443 pop_frame_kboard ();
17f7be3e2443 (display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents: 11291
diff changeset
11444
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11445 /* Fill up with spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11446 display_string (" ", Qnil, Qnil, 0, 0, &it, 10000, -1, -1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11447
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11448 compute_line_metrics (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11449 it.glyph_row->full_width_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11450 it.glyph_row->mode_line_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11451 it.glyph_row->inverse_p = mode_line_inverse_video != 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11452 it.glyph_row->continued_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11453 it.glyph_row->truncated_on_left_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11454 it.glyph_row->truncated_on_right_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11455
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11456 /* Make a 3D mode-line have a shadow at its right end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11457 face = FACE_FROM_ID (it.f, face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11458 extend_face_to_end_of_line (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11459 if (face->box != FACE_NO_BOX)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11460 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11461 struct glyph *last = (it.glyph_row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11462 + it.glyph_row->used[TEXT_AREA] - 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11463 last->right_box_line_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11464 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11465 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11466
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11467
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11468 /* Contribute ELT to the mode line for window IT->w. How it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11469 translates into text depends on its data type.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11470
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11471 IT describes the display environment in which we display, as usual.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11472
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11473 DEPTH is the depth in recursion. It is used to prevent
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11474 infinite recursion here.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11475
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11476 FIELD_WIDTH is the number of characters the display of ELT should
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11477 occupy in the mode line, and PRECISION is the maximum number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11478 characters to display from ELT's representation. See
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11479 display_string for details. *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11480
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11481 Returns the hpos of the end of the text generated by ELT. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11482
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11483 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11484 display_mode_element (it, depth, field_width, precision, elt)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11485 struct it *it;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11486 int depth;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11487 int field_width, precision;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11488 Lisp_Object elt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11489 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11490 int n = 0, field, prec;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11491
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11492 tail_recurse:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11493 if (depth > 10)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11494 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11495
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11496 depth++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11497
10457
2ab3bd0288a9 Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents: 10442
diff changeset
11498 switch (SWITCH_ENUM_CAST (XTYPE (elt)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11499 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11500 case Lisp_String:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11501 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11502 /* A string: output it and check for %-constructs within it. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11503 unsigned char c;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11504 unsigned char *this = XSTRING (elt)->data;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11505 unsigned char *lisp_string = this;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11506
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11507 while ((precision <= 0 || n < precision)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11508 && *this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11509 && (frame_title_ptr
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11510 || it->current_x < it->last_visible_x))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11511 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11512 unsigned char *last = this;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11513
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11514 /* Advance to end of string or next format specifier. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11515 while ((c = *this++) != '\0' && c != '%')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11516 ;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11517
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11518 if (this - 1 != last)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11519 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11520 /* Output to end of string or up to '%'. Field width
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11521 is length of string. Don't output more than
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11522 PRECISION allows us. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11523 prec = --this - last;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11524 if (precision > 0 && prec > precision - n)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11525 prec = precision - n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11526
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
11527 if (frame_title_ptr)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11528 n += store_frame_title (last, prec, prec);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
11529 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11530 n += display_string (NULL, elt, Qnil, 0, last - lisp_string,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11531 it, 0, prec, 0, -1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11532 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11533 else /* c == '%' */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11534 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11535 unsigned char *percent_position = this;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11536
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11537 /* Get the specified minimum width. Zero means
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11538 don't pad. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11539 field = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11540 while ((c = *this++) >= '0' && c <= '9')
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11541 field = field * 10 + c - '0';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11542
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11543 /* Don't pad beyond the total padding allowed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11544 if (field_width - n > 0 && field > field_width - n)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11545 field = field_width - n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11546
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11547 /* Note that either PRECISION <= 0 or N < PRECISION. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11548 prec = precision - n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11549
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11550 if (c == 'M')
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11551 n += display_mode_element (it, depth, field, prec,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11552 Vglobal_mode_string);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11553 else if (c != 0)
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
11554 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11555 unsigned char *spec
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11556 = decode_mode_spec (it->w, c, field, prec);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11557
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
11558 if (frame_title_ptr)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11559 n += store_frame_title (spec, field, prec);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
11560 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11561 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11562 int nglyphs_before
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11563 = it->glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11564 int charpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11565 = percent_position - XSTRING (elt)->data;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11566 int nwritten
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11567 = display_string (spec, Qnil, elt, charpos, 0, it,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11568 field, prec, 0, -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11569
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11570 /* Assign to the glyphs written above the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11571 string where the `%x' came from, position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11572 of the `%'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11573 if (nwritten > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11574 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11575 struct glyph *glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11576 = (it->glyph_row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11577 + nglyphs_before);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11578 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11579
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11580 for (i = 0; i < nwritten; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11581 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11582 glyph[i].object = elt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11583 glyph[i].charpos = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11584 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11585
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11586 n += nwritten;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11587 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11588 }
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
11589 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11590 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11591 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11592 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11593 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11594
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11595 case Lisp_Symbol:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11596 /* A symbol: process the value of the symbol recursively
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11597 as if it appeared here directly. Avoid error if symbol void.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11598 Special case: if value of symbol is a string, output the string
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11599 literally. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11600 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11601 register Lisp_Object tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11602 tem = Fboundp (elt);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
11603 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11604 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11605 tem = Fsymbol_value (elt);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11606 /* If value is a string, output that string literally:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11607 don't check for % within it. */
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
11608 if (STRINGP (tem))
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
11609 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11610 prec = XSTRING (tem)->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11611 if (precision > 0 && prec > precision - n)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11612 prec = precision - n;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
11613 if (frame_title_ptr)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11614 n += store_frame_title (XSTRING (tem)->data, -1, prec);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
11615 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11616 n += display_string (NULL, tem, Qnil, 0, 0, it,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11617 0, prec, 0, -1);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
11618 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11619 else if (!EQ (tem, elt))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11620 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11621 /* Give up right away for nil or t. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11622 elt = tem;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11623 goto tail_recurse;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11624 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11625 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11626 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11627 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11628
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11629 case Lisp_Cons:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11630 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11631 register Lisp_Object car, tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11632
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11633 /* A cons cell: three distinct cases.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11634 If first element is a string or a cons, process all the elements
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11635 and effectively concatenate them.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11636 If first element is a negative number, truncate displaying cdr to
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11637 at most that many characters. If positive, pad (with spaces)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11638 to at least that many characters.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11639 If first element is a symbol, process the cadr or caddr recursively
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11640 according to whether the symbol's value is non-nil or nil. */
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
11641 car = XCAR (elt);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11642 if (EQ (car, QCeval) && CONSP (XCDR (elt)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11643 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11644 /* An element of the form (:eval FORM) means evaluate FORM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11645 and use the result as mode line elements. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11646 struct gcpro gcpro1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11647 Lisp_Object spec;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11648
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11649 spec = eval_form (XCAR (XCDR (elt)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11650 GCPRO1 (spec);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11651 n += display_mode_element (it, depth, field_width - n,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11652 precision - n, spec);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11653 UNGCPRO;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11654 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11655 else if (SYMBOLP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11656 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11657 tem = Fboundp (car);
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
11658 elt = XCDR (elt);
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
11659 if (!CONSP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11660 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11661 /* elt is now the cdr, and we know it is a cons cell.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11662 Use its car if CAR has a non-nil value. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
11663 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11664 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11665 tem = Fsymbol_value (car);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
11666 if (!NILP (tem))
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
11667 {
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
11668 elt = XCAR (elt);
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
11669 goto tail_recurse;
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
11670 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11671 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11672 /* Symbol's value is nil (or symbol is unbound)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11673 Get the cddr of the original list
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11674 and if possible find the caddr and use that. */
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
11675 elt = XCDR (elt);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
11676 if (NILP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11677 break;
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
11678 else if (!CONSP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11679 goto invalid;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
11680 elt = XCAR (elt);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11681 goto tail_recurse;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11682 }
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
11683 else if (INTEGERP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11684 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11685 register int lim = XINT (car);
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
11686 elt = XCDR (elt);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11687 if (lim < 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11688 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11689 /* Negative int means reduce maximum width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11690 if (precision <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11691 precision = -lim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11692 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11693 precision = min (precision, -lim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11694 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11695 else if (lim > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11696 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11697 /* Padding specified. Don't let it be more than
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11698 current maximum. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11699 if (precision > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11700 lim = min (precision, lim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11701
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11702 /* If that's more padding than already wanted, queue it.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11703 But don't reduce padding already specified even if
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11704 that is beyond the current truncation point. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11705 field_width = max (lim, field_width);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11706 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11707 goto tail_recurse;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11708 }
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
11709 else if (STRINGP (car) || CONSP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11710 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11711 register int limit = 50;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11712 /* Limit is to protect against circular lists. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11713 while (CONSP (elt)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11714 && --limit > 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11715 && (precision <= 0 || n < precision))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11716 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11717 n += display_mode_element (it, depth, field_width - n,
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
11718 precision - n, XCAR (elt));
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
11719 elt = XCDR (elt);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11720 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11721 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11722 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11723 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11724
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11725 default:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11726 invalid:
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
11727 if (frame_title_ptr)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11728 n += store_frame_title ("*invalid*", 0, precision - n);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
11729 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11730 n += display_string ("*invalid*", Qnil, Qnil, 0, 0, it, 0,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11731 precision - n, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11732 return n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11733 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11734
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11735 /* Pad to FIELD_WIDTH. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11736 if (field_width > 0 && n < field_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11737 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11738 if (frame_title_ptr)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11739 n += store_frame_title ("", field_width - n, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11740 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11741 n += display_string ("", Qnil, Qnil, 0, 0, it, field_width - n,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11742 0, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11743 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11744
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11745 return n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11746 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11747
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11748
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11749 /* Write a null-terminated, right justified decimal representation of
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11750 the positive integer D to BUF using a minimal field width WIDTH. */
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11751
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11752 static void
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11753 pint2str (buf, width, d)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11754 register char *buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11755 register int width;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11756 register int d;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11757 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11758 register char *p = buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11759
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11760 if (d <= 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11761 *p++ = '0';
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11762 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11763 {
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11764 while (d > 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11765 {
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11766 *p++ = d % 10 + '0';
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11767 d /= 10;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11768 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11769 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11770
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11771 for (width -= (int) (p - buf); width > 0; --width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11772 *p++ = ' ';
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11773 *p-- = '\0';
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11774 while (p > buf)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11775 {
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11776 d = *buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11777 *buf++ = *p;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11778 *p-- = d;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11779 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11780 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11781
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11782 /* Set a mnemonic character for coding_system (Lisp symbol) in BUF.
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11783 If EOL_FLAG is 1, set also a mnemonic character for end-of-line
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11784 type of CODING_SYSTEM. Return updated pointer into BUF. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11785
24868
de2065294ca3 (invalid_eol_type): Make it unsigned.
Karl Heuer <kwzh@gnu.org>
parents: 24711
diff changeset
11786 static unsigned char invalid_eol_type[] = "(*invalid*)";
24199
204d0a24ddf5 (decode_mode_spec_coding): Display the EOL type as a string.
Eli Zaretskii <eliz@gnu.org>
parents: 24040
diff changeset
11787
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11788 static char *
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11789 decode_mode_spec_coding (coding_system, buf, eol_flag)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11790 Lisp_Object coding_system;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11791 register char *buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11792 int eol_flag;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11793 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11794 Lisp_Object val;
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
11795 int multibyte = !NILP (current_buffer->enable_multibyte_characters);
24215
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11796 unsigned char *eol_str;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11797 int eol_str_len;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11798 /* The EOL conversion we are using. */
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11799 Lisp_Object eoltype;
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11800
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11801 val = coding_system;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11802
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11803 if (NILP (val)) /* Not yet decided. */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11804 {
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
11805 if (multibyte)
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
11806 *buf++ = '-';
18677
7648eb8e46d2 (decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents: 18653
diff changeset
11807 if (eol_flag)
24215
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11808 eoltype = eol_mnemonic_undecided;
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11809 /* Don't mention EOL conversion if it isn't decided. */
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11810 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11811 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11812 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11813 Lisp_Object eolvalue;
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11814
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11815 eolvalue = Fget (coding_system, Qeol_type);
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11816
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11817 while (!NILP (val) && SYMBOLP (val))
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11818 {
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11819 val = Fget (val, Qcoding_system);
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11820 if (NILP (eolvalue))
18834
a4b74a7b692a (decode_mode_spec_coding): Fix typo; use `val' instead of `coding-system'.
Richard M. Stallman <rms@gnu.org>
parents: 18829
diff changeset
11821 eolvalue = Fget (val, Qeol_type);
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11822 }
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11823
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
11824 if (multibyte)
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
11825 *buf++ = XFASTINT (XVECTOR (val)->contents[1]);
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
11826
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11827 if (eol_flag)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11828 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11829 /* The EOL conversion that is normal on this system. */
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11830
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11831 if (NILP (eolvalue)) /* Not yet decided. */
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11832 eoltype = eol_mnemonic_undecided;
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11833 else if (VECTORP (eolvalue)) /* Not yet decided. */
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11834 eoltype = eol_mnemonic_undecided;
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11835 else /* INTEGERP (eolvalue) -- 0:LF, 1:CRLF, 2:CR */
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11836 eoltype = (XFASTINT (eolvalue) == 0
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11837 ? eol_mnemonic_unix
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11838 : (XFASTINT (eolvalue) == 1
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
11839 ? eol_mnemonic_dos : eol_mnemonic_mac));
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11840 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11841 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11842
24215
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11843 if (eol_flag)
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11844 {
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11845 /* Mention the EOL conversion if it is not the usual one. */
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11846 if (STRINGP (eoltype))
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11847 {
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11848 eol_str = XSTRING (eoltype)->data;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11849 eol_str_len = XSTRING (eoltype)->size;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11850 }
24511
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
11851 else if (INTEGERP (eoltype)
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
11852 && CHAR_VALID_P (XINT (eoltype), 0))
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
11853 {
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
11854 unsigned char work[4];
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
11855
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
11856 eol_str_len = CHAR_STRING (XINT (eoltype), work, eol_str);
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
11857 }
24215
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11858 else
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11859 {
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11860 eol_str = invalid_eol_type;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11861 eol_str_len = sizeof (invalid_eol_type) - 1;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11862 }
24511
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
11863 bcopy (eol_str, buf, eol_str_len);
24215
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11864 buf += eol_str_len;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11865 }
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
11866
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11867 return buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11868 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
11869
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11870 /* Return a string for the output of a mode line %-spec for window W,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11871 generated by character C. PRECISION >= 0 means don't return a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11872 string longer than that value. FIELD_WIDTH > 0 means pad the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11873 string returned with spaces to that value. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11874
1017
d42877206c0a * xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents: 973
diff changeset
11875 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
11876
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11877 static char *
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11878 decode_mode_spec (w, c, field_width, precision)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11879 struct window *w;
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26018
diff changeset
11880 register int c;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11881 int field_width, precision;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11882 {
6518
07ecb7a5c916 (x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6415
diff changeset
11883 Lisp_Object obj;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11884 struct frame *f = XFRAME (WINDOW_FRAME (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11885 char *decode_mode_spec_buf = f->decode_mode_spec_buffer;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
11886 struct buffer *b = XBUFFER (w->buffer);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11887
6518
07ecb7a5c916 (x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6415
diff changeset
11888 obj = Qnil;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11889
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11890 switch (c)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11891 {
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11892 case '*':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11893 if (!NILP (b->read_only))
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11894 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11895 if (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11896 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11897 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11898
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11899 case '+':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11900 /* This differs from %* only for a modified read-only buffer. */
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11901 if (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11902 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11903 if (!NILP (b->read_only))
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11904 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11905 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11906
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11907 case '&':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11908 /* This differs from %* in ignoring read-only-ness. */
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11909 if (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11910 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11911 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11912
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11913 case '%':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11914 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11915
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11916 case '[':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11917 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11918 int i;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11919 char *p;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11920
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11921 if (command_loop_level > 5)
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11922 return "[[[... ";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11923 p = decode_mode_spec_buf;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11924 for (i = 0; i < command_loop_level; i++)
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11925 *p++ = '[';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11926 *p = 0;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11927 return decode_mode_spec_buf;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11928 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11929
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11930 case ']':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11931 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11932 int i;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11933 char *p;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11934
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11935 if (command_loop_level > 5)
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11936 return " ...]]]";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11937 p = decode_mode_spec_buf;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11938 for (i = 0; i < command_loop_level; i++)
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11939 *p++ = ']';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11940 *p = 0;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11941 return decode_mode_spec_buf;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11942 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11943
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11944 case '-':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11945 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11946 register int i;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11947
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11948 /* Let lots_of_dashes be a string of infinite length. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11949 if (field_width <= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11950 || field_width > sizeof (lots_of_dashes))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11951 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11952 for (i = 0; i < FRAME_MESSAGE_BUF_SIZE (f) - 1; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11953 decode_mode_spec_buf[i] = '-';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11954 decode_mode_spec_buf[i] = '\0';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11955 return decode_mode_spec_buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11956 }
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11957 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11958 return lots_of_dashes;
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11959 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11960
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11961 case 'b':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
11962 obj = b->name;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11963 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11964
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11965 case 'c':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11966 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11967 int col = current_column ();
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11968 XSETFASTINT (w->column_number_displayed, col);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11969 pint2str (decode_mode_spec_buf, field_width, col);
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11970 return decode_mode_spec_buf;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11971 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11972
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11973 case 'F':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11974 /* %F displays the frame name. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11975 if (!NILP (f->title))
15038
2376256a0204 (decode_mode_spec): Use frame F, not selected frame.
Richard M. Stallman <rms@gnu.org>
parents: 15037
diff changeset
11976 return (char *) XSTRING (f->title)->data;
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
11977 if (f->explicit_name || ! FRAME_WINDOW_P (f))
15038
2376256a0204 (decode_mode_spec): Use frame F, not selected frame.
Richard M. Stallman <rms@gnu.org>
parents: 15037
diff changeset
11978 return (char *) XSTRING (f->name)->data;
12348
7d39ee7e0ca3 (decode_mode_spec) [!MULTI_FRAME]: Handle %F properly.
Richard M. Stallman <rms@gnu.org>
parents: 12293
diff changeset
11979 return "Emacs";
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
11980
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11981 case 'f':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
11982 obj = b->filename;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11983 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11984
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
11985 case 'l':
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
11986 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
11987 int startpos = XMARKER (w->start)->charpos;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
11988 int startpos_byte = marker_byte_position (w->start);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
11989 int line, linepos, linepos_byte, topline;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
11990 int nlines, junk;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
11991 int height = XFASTINT (w->height);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
11992
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
11993 /* 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
11994 don't forget that too fast. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
11995 if (EQ (w->base_line_pos, w->buffer))
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
11996 goto no_value;
16463
c6a338fd1938 (decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents: 16397
diff changeset
11997 /* But do forget it, if the window shows a different buffer now. */
c6a338fd1938 (decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents: 16397
diff changeset
11998 else if (BUFFERP (w->base_line_pos))
c6a338fd1938 (decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents: 16397
diff changeset
11999 w->base_line_pos = Qnil;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12000
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12001 /* If the buffer is very big, don't waste time. */
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12002 if (BUF_ZV (b) - BUF_BEGV (b) > line_number_display_limit)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12003 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12004 w->base_line_pos = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12005 w->base_line_number = Qnil;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12006 goto no_value;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12007 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12008
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12009 if (!NILP (w->base_line_number)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12010 && !NILP (w->base_line_pos)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12011 && XFASTINT (w->base_line_pos) <= startpos)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12012 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12013 line = XFASTINT (w->base_line_number);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12014 linepos = XFASTINT (w->base_line_pos);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12015 linepos_byte = buf_charpos_to_bytepos (b, linepos);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12016 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12017 else
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12018 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12019 line = 1;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12020 linepos = BUF_BEGV (b);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12021 linepos_byte = BUF_BEGV_BYTE (b);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12022 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12023
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12024 /* Count lines from base line to window start position. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12025 nlines = display_count_lines (linepos, linepos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12026 startpos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12027 startpos, &junk);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12028
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12029 topline = nlines + line;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12030
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12031 /* 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
12032 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
12033 "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
12034 go back past it. */
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12035 if (startpos == BUF_BEGV (b))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12036 {
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
12037 XSETFASTINT (w->base_line_number, topline);
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
12038 XSETFASTINT (w->base_line_pos, BUF_BEGV (b));
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12039 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12040 else if (nlines < height + 25 || nlines > height * 3 + 50
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12041 || linepos == BUF_BEGV (b))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12042 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12043 int limit = BUF_BEGV (b);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12044 int limit_byte = BUF_BEGV_BYTE (b);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12045 int position;
25258
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
12046 int distance = (height * 2 + 30) * line_number_display_limit_width;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12047
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12048 if (startpos - distance > limit)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12049 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12050 limit = startpos - distance;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12051 limit_byte = CHAR_TO_BYTE (limit);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12052 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12053
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12054 nlines = display_count_lines (startpos, startpos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12055 limit_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12056 - (height * 2 + 30),
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12057 &position);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12058 /* If we couldn't find the lines we wanted within
25258
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
12059 line_number_display_limit_width chars per line,
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12060 give up on line numbers for this window. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12061 if (position == limit_byte && limit == startpos - distance)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12062 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12063 w->base_line_pos = w->buffer;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12064 w->base_line_number = Qnil;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12065 goto no_value;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12066 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12067
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
12068 XSETFASTINT (w->base_line_number, topline - nlines);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12069 XSETFASTINT (w->base_line_pos, BYTE_TO_CHAR (position));
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12070 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12071
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12072 /* Now count lines from the start pos to point. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12073 nlines = display_count_lines (startpos, startpos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12074 PT_BYTE, PT, &junk);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12075
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12076 /* Record that we did display the line number. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12077 line_number_displayed = 1;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12078
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12079 /* Make the string to show. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12080 pint2str (decode_mode_spec_buf, field_width, topline + nlines);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12081 return decode_mode_spec_buf;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12082 no_value:
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12083 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12084 char* p = decode_mode_spec_buf;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12085 int pad = field_width - 2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12086 while (pad-- > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12087 *p++ = ' ';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12088 *p++ = '?';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12089 *p = '?';
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12090 return decode_mode_spec_buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12091 }
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12092 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12093 break;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12094
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12095 case 'm':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12096 obj = b->mode_name;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12097 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12098
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12099 case 'n':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12100 if (BUF_BEGV (b) > BUF_BEG (b) || BUF_ZV (b) < BUF_Z (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12101 return " Narrow";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12102 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12103
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12104 case 'p':
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12105 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12106 int pos = marker_position (w->start);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12107 int total = BUF_ZV (b) - BUF_BEGV (b);
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12108
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12109 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12110 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12111 if (pos <= BUF_BEGV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12112 return "All";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12113 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12114 return "Bottom";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12115 }
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12116 else if (pos <= BUF_BEGV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12117 return "Top";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12118 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12119 {
13655
5dd2d988f3c3 (decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents: 13584
diff changeset
12120 if (total > 1000000)
5dd2d988f3c3 (decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents: 13584
diff changeset
12121 /* Do it differently for a large value, to avoid overflow. */
5dd2d988f3c3 (decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents: 13584
diff changeset
12122 total = ((pos - BUF_BEGV (b)) + (total / 100) - 1) / (total / 100);
5dd2d988f3c3 (decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents: 13584
diff changeset
12123 else
5dd2d988f3c3 (decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents: 13584
diff changeset
12124 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12125 /* We can't normally display a 3-digit number,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12126 so get us a 2-digit number that is close. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12127 if (total == 100)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12128 total = 99;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12129 sprintf (decode_mode_spec_buf, "%2d%%", total);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12130 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12131 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12132 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12133
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12134 /* Display percentage of size above the bottom of the screen. */
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12135 case 'P':
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12136 {
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12137 int toppos = marker_position (w->start);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12138 int botpos = BUF_Z (b) - XFASTINT (w->window_end_pos);
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12139 int total = BUF_ZV (b) - BUF_BEGV (b);
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12140
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12141 if (botpos >= BUF_ZV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12142 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12143 if (toppos <= BUF_BEGV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12144 return "All";
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12145 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12146 return "Bottom";
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12147 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12148 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12149 {
13655
5dd2d988f3c3 (decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents: 13584
diff changeset
12150 if (total > 1000000)
5dd2d988f3c3 (decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents: 13584
diff changeset
12151 /* Do it differently for a large value, to avoid overflow. */
5dd2d988f3c3 (decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents: 13584
diff changeset
12152 total = ((botpos - BUF_BEGV (b)) + (total / 100) - 1) / (total / 100);
5dd2d988f3c3 (decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents: 13584
diff changeset
12153 else
5dd2d988f3c3 (decode_mode_spec): For p and P, avoid overflow with large buffer sizes.
Richard M. Stallman <rms@gnu.org>
parents: 13584
diff changeset
12154 total = ((botpos - BUF_BEGV (b)) * 100 + total - 1) / total;
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12155 /* We can't normally display a 3-digit number,
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12156 so get us a 2-digit number that is close. */
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12157 if (total == 100)
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12158 total = 99;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12159 if (toppos <= BUF_BEGV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12160 sprintf (decode_mode_spec_buf, "Top%2d%%", total);
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12161 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12162 sprintf (decode_mode_spec_buf, "%2d%%", total);
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12163 return decode_mode_spec_buf;
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12164 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12165 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
12166
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12167 case 's':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12168 /* status of process */
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12169 obj = Fget_buffer_process (w->buffer);
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12170 if (NILP (obj))
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12171 return "no process";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12172 #ifdef subprocesses
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12173 obj = Fsymbol_name (Fprocess_status (obj));
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12174 #endif
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12175 break;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12176
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12177 case 't': /* indicate TEXT or BINARY */
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12178 #ifdef MODE_LINE_BINARY_TEXT
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12179 return MODE_LINE_BINARY_TEXT (b);
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12180 #else
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12181 return "T";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12182 #endif
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12183
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12184 case 'z':
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12185 /* coding-system (not including end-of-line format) */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12186 case 'Z':
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12187 /* coding-system (including end-of-line type) */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12188 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12189 int eol_flag = (c == 'Z');
18761
756cb4d82a49 (decode_mode_spec): Initialize and use `p' (for the termcap case).
Richard M. Stallman <rms@gnu.org>
parents: 18752
diff changeset
12190 char *p = decode_mode_spec_buf;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12191
19562
318a3a6a8ff5 (decode_mode_spec): For %Z and %z, put keyboard and
Richard M. Stallman <rms@gnu.org>
parents: 19478
diff changeset
12192 if (! FRAME_WINDOW_P (f))
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12193 {
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
12194 /* No need to mention EOL here--the terminal never needs
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
12195 to do EOL conversion. */
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
12196 p = decode_mode_spec_coding (keyboard_coding.symbol, p, 0);
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
12197 p = decode_mode_spec_coding (terminal_coding.symbol, p, 0);
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12198 }
18684
76bdd57b476d (decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents: 18677
diff changeset
12199 p = decode_mode_spec_coding (b->buffer_file_coding_system,
18761
756cb4d82a49 (decode_mode_spec): Initialize and use `p' (for the termcap case).
Richard M. Stallman <rms@gnu.org>
parents: 18752
diff changeset
12200 p, eol_flag);
18684
76bdd57b476d (decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents: 18677
diff changeset
12201
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
12202 #if 0 /* This proves to be annoying; I think we can do without. -- rms. */
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12203 #ifdef subprocesses
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12204 obj = Fget_buffer_process (Fcurrent_buffer ());
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12205 if (PROCESSP (obj))
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12206 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12207 p = decode_mode_spec_coding (XPROCESS (obj)->decode_coding_system,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12208 p, eol_flag);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12209 p = decode_mode_spec_coding (XPROCESS (obj)->encode_coding_system,
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12210 p, eol_flag);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12211 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12212 #endif /* subprocesses */
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
12213 #endif /* 0 */
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12214 *p = 0;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12215 return decode_mode_spec_buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12216 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12217 }
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12218
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
12219 if (STRINGP (obj))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12220 return (char *) XSTRING (obj)->data;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12221 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12222 return "";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12223 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12224
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12225
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12226 /* Count up to COUNT lines starting from START / START_BYTE.
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12227 But don't go beyond LIMIT_BYTE.
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12228 Return the number of lines thus found (always nonnegative).
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12229
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12230 Set *BYTE_POS_PTR to 1 if we found COUNT lines, 0 if we hit LIMIT. */
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12231
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12232 static int
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12233 display_count_lines (start, start_byte, limit_byte, count, byte_pos_ptr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12234 int start, start_byte, limit_byte, count;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12235 int *byte_pos_ptr;
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12236 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12237 register unsigned char *cursor;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12238 unsigned char *base;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12239
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12240 register int ceiling;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12241 register unsigned char *ceiling_addr;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12242 int orig_count = count;
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12243
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12244 /* If we are not in selective display mode,
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12245 check only for newlines. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12246 int selective_display = (!NILP (current_buffer->selective_display)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12247 && !INTEGERP (current_buffer->selective_display));
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12248
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12249 if (count > 0)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12250 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12251 while (start_byte < limit_byte)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12252 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12253 ceiling = BUFFER_CEILING_OF (start_byte);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12254 ceiling = min (limit_byte - 1, ceiling);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12255 ceiling_addr = BYTE_POS_ADDR (ceiling) + 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12256 base = (cursor = BYTE_POS_ADDR (start_byte));
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12257 while (1)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12258 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12259 if (selective_display)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12260 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12261 ;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12262 else
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12263 while (*cursor != '\n' && ++cursor != ceiling_addr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12264 ;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12265
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12266 if (cursor != ceiling_addr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12267 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12268 if (--count == 0)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12269 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12270 start_byte += cursor - base + 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12271 *byte_pos_ptr = start_byte;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12272 return orig_count;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12273 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12274 else
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12275 if (++cursor == ceiling_addr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12276 break;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12277 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12278 else
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12279 break;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12280 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12281 start_byte += cursor - base;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12282 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12283 }
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12284 else
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12285 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12286 while (start_byte > limit_byte)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12287 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12288 ceiling = BUFFER_FLOOR_OF (start_byte - 1);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12289 ceiling = max (limit_byte, ceiling);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12290 ceiling_addr = BYTE_POS_ADDR (ceiling) - 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12291 base = (cursor = BYTE_POS_ADDR (start_byte - 1) + 1);
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12292 while (1)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12293 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12294 if (selective_display)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12295 while (--cursor != ceiling_addr
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12296 && *cursor != '\n' && *cursor != 015)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12297 ;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12298 else
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12299 while (--cursor != ceiling_addr && *cursor != '\n')
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12300 ;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12301
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12302 if (cursor != ceiling_addr)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12303 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12304 if (++count == 0)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12305 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12306 start_byte += cursor - base + 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12307 *byte_pos_ptr = start_byte;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12308 /* When scanning backwards, we should
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12309 not count the newline posterior to which we stop. */
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12310 return - orig_count - 1;
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12311 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12312 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12313 else
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12314 break;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12315 }
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12316 /* Here we add 1 to compensate for the last decrement
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12317 of CURSOR, which took it past the valid range. */
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12318 start_byte += cursor - base + 1;
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12319 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12320 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12321
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12322 *byte_pos_ptr = limit_byte;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12323
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12324 if (count < 0)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12325 return - orig_count + count;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12326 return orig_count - count;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12327
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
12328 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12329
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12330
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12331
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12332 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12333 Displaying strings
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12334 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12335
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12336 /* Display a NUL-terminated string, starting with index START.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12337
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12338 If STRING is non-null, display that C string. Otherwise, the Lisp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12339 string LISP_STRING is displayed.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12340
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12341 If FACE_STRING is not nil, FACE_STRING_POS is a position in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12342 FACE_STRING. Display STRING or LISP_STRING with the face at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12343 FACE_STRING_POS in FACE_STRING:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12344
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12345 Display the string in the environment given by IT, but use the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12346 standard display table, temporarily.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12347
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12348 FIELD_WIDTH is the minimum number of output glyphs to produce.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12349 If STRING has fewer characters than FIELD_WIDTH, pad to the right
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12350 with spaces. If STRING has more characters, more than FIELD_WIDTH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12351 glyphs will be produced. FIELD_WIDTH <= 0 means don't pad.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12352
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12353 PRECISION is the maximum number of characters to output from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12354 STRING. PRECISION < 0 means don't truncate the string.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12355
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12356 This is roughly equivalent to printf format specifiers:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12357
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12358 FIELD_WIDTH PRECISION PRINTF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12359 ----------------------------------------
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12360 -1 -1 %s
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12361 -1 10 %.10s
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12362 10 -1 %10s
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12363 20 10 %20.10s
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12364
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12365 MULTIBYTE zero means do not display multibyte chars, > 0 means do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12366 display them, and < 0 means obey the current buffer's value of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12367 enable_multibyte_characters.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12368
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12369 Value is the number of glyphs produced. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12370
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12371 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12372 display_string (string, lisp_string, face_string, face_string_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12373 start, it, field_width, precision, max_x, multibyte)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12374 unsigned char *string;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12375 Lisp_Object lisp_string;
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26018
diff changeset
12376 Lisp_Object face_string;
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26018
diff changeset
12377 int face_string_pos;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12378 int start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12379 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12380 int field_width, precision, max_x;
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
12381 int multibyte;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12382 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12383 int hpos_at_start = it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12384 int saved_face_id = it->face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12385 struct glyph_row *row = it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12386
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12387 /* Initialize the iterator IT for iteration over STRING beginning
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12388 with index START. We assume that IT may be modified here (which
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12389 means that display_line has to do something when displaying a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12390 mini-buffer prompt, which it does). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12391 reseat_to_string (it, string, lisp_string, start,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12392 precision, field_width, multibyte);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12393
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12394 /* If displaying STRING, set up the face of the iterator
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12395 from LISP_STRING, if that's given. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12396 if (STRINGP (face_string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12397 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12398 int endptr;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12399 struct face *face;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12400
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12401 it->face_id
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12402 = face_at_string_position (it->w, face_string, face_string_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12403 0, it->region_beg_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12404 it->region_end_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12405 &endptr, it->base_face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12406 face = FACE_FROM_ID (it->f, it->face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12407 it->face_box_p = face->box != FACE_NO_BOX;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12408 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12409
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12410 /* Set max_x to the maximum allowed X position. Don't let it go
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12411 beyond the right edge of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12412 if (max_x <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12413 max_x = it->last_visible_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12414 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12415 max_x = min (max_x, it->last_visible_x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12416
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12417 /* Skip over display elements that are not visible. because IT->w is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12418 hscrolled. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12419 if (it->current_x < it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12420 move_it_in_display_line_to (it, 100000, it->first_visible_x,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12421 MOVE_TO_POS | MOVE_TO_X);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12422
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12423 row->ascent = it->max_ascent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12424 row->height = it->max_ascent + it->max_descent;
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
12425 row->phys_ascent = it->max_phys_ascent;
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
12426 row->phys_height = it->max_phys_ascent + it->max_phys_descent;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12427
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12428 /* This condition is for the case that we are called with current_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12429 past last_visible_x. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12430 while (it->current_x < max_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12431 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12432 int x_before, x, n_glyphs_before, i, nglyphs;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12433
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12434 /* Get the next display element. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12435 if (!get_next_display_element (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12436 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12437
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12438 /* Produce glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12439 x_before = it->current_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12440 n_glyphs_before = it->glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12441 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12442
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12443 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12444 i = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12445 x = x_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12446 while (i < nglyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12447 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12448 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12449
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12450 if (!it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12451 && x + glyph->pixel_width > max_x)
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
12452 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12453 /* End of continued line or max_x reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12454 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12455 it->current_x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12456 break;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12457 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12458 else if (x + glyph->pixel_width > it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12459 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12460 /* Glyph is at least partially visible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12461 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12462 if (x < it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12463 it->glyph_row->x = x - it->first_visible_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12464 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12465 else
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12466 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12467 /* Glyph is off the left margin of the display area.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12468 Should not happen. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12469 abort ();
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12470 }
23647
d87960db41e9 (display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents: 23417
diff changeset
12471
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12472 row->ascent = max (row->ascent, it->max_ascent);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12473 row->height = max (row->height, it->max_ascent + it->max_descent);
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
12474 row->phys_ascent = max (row->phys_ascent, it->max_phys_ascent);
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
12475 row->phys_height = max (row->phys_height,
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
12476 it->max_phys_ascent + it->max_phys_descent);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12477 x += glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12478 ++i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12479 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12480
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12481 /* Stop if max_x reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12482 if (i < nglyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12483 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12484
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12485 /* Stop at line ends. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12486 if (ITERATOR_AT_END_OF_LINE_P (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12487 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12488 it->continuation_lines_width = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12489 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12490 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12491
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12492 set_iterator_to_next (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12493
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12494 /* Stop if truncating at the right edge. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12495 if (it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12496 && it->current_x >= it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12497 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12498 /* Add truncation mark, but don't do it if the line is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12499 truncated at a padding space. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12500 if (IT_CHARPOS (*it) < it->string_nchars)
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12501 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12502 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12503 produce_special_glyphs (it, IT_TRUNCATION);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12504 it->glyph_row->truncated_on_right_p = 1;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12505 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12506 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12507 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12508 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12509
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12510 /* Maybe insert a truncation at the left. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12511 if (it->first_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12512 && IT_CHARPOS (*it) > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12513 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12514 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12515 insert_left_trunc_glyphs (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12516 it->glyph_row->truncated_on_left_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12517 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12518
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12519 it->face_id = saved_face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12520
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12521 /* Value is number of columns displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12522 return it->hpos - hpos_at_start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12523 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12524
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12525
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12526
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12527 /* This is like a combination of memq and assq. Return 1 if PROPVAL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12528 appears as an element of LIST or as the car of an element of LIST.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12529 If PROPVAL is a list, compare each element against LIST in that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12530 way, and return 1 if any element of PROPVAL is found in LIST.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12531 Otherwise return 0. This function cannot quit. */
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12532
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12533 int
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12534 invisible_p (propval, list)
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12535 register Lisp_Object propval;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12536 Lisp_Object list;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12537 {
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12538 register Lisp_Object tail, proptail;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12539 for (tail = list; CONSP (tail); tail = XCDR (tail))
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12540 {
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12541 register Lisp_Object tem;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12542 tem = XCAR (tail);
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12543 if (EQ (propval, tem))
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12544 return 1;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12545 if (CONSP (tem) && EQ (propval, XCAR (tem)))
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12546 return 1;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12547 }
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12548 if (CONSP (propval))
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12549 for (proptail = propval; CONSP (proptail);
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12550 proptail = XCDR (proptail))
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12551 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12552 Lisp_Object propelt;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12553 propelt = XCAR (proptail);
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12554 for (tail = list; CONSP (tail); tail = XCDR (tail))
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12555 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12556 register Lisp_Object tem;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12557 tem = XCAR (tail);
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12558 if (EQ (propelt, tem))
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12559 return 1;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12560 if (CONSP (tem) && EQ (propelt, XCAR (tem)))
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12561 return 1;
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12562 }
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12563 }
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12564 return 0;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12565 }
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12566
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12567
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12568 /* Return 1 if PROPVAL appears as the car of an element of LIST and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12569 the cdr of that element is non-nil. If PROPVAL is a list, check
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12570 each element of PROPVAL in that way, and the first time some
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12571 element is found, return 1 if the cdr of that element is non-nil.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12572 Otherwise return 0. This function cannot quit. */
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12573
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12574 int
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12575 invisible_ellipsis_p (propval, list)
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12576 register Lisp_Object propval;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12577 Lisp_Object list;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12578 {
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12579 register Lisp_Object tail, proptail;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12580
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12581 for (tail = list; CONSP (tail); tail = XCDR (tail))
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12582 {
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12583 register Lisp_Object tem;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12584 tem = XCAR (tail);
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12585 if (CONSP (tem) && EQ (propval, XCAR (tem)))
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12586 return ! NILP (XCDR (tem));
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12587 }
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12588
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12589 if (CONSP (propval))
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12590 for (proptail = propval; CONSP (proptail); proptail = XCDR (proptail))
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12591 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12592 Lisp_Object propelt;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12593 propelt = XCAR (proptail);
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12594 for (tail = list; CONSP (tail); tail = XCDR (tail))
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12595 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12596 register Lisp_Object tem;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12597 tem = XCAR (tail);
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12598 if (CONSP (tem) && EQ (propelt, XCAR (tem)))
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12599 return ! NILP (XCDR (tem));
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12600 }
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
12601 }
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12602
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12603 return 0;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12604 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12605
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12606
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
12607
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12608 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12609 Initialization
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12610 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12611
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12612 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12613 syms_of_xdisp ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12614 {
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12615 Vwith_echo_area_save_vector = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12616 staticpro (&Vwith_echo_area_save_vector);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12617
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12618 Vmessage_stack = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12619 staticpro (&Vmessage_stack);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12620
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12621 Qinhibit_redisplay = intern ("inhibit-redisplay");
22543
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
12622 staticpro (&Qinhibit_redisplay);
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
12623
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12624 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12625 defsubr (&Sdump_glyph_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12626 defsubr (&Sdump_glyph_row);
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12627 defsubr (&Sdump_tool_bar_row);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12628 defsubr (&Strace_redisplay_toggle);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12629 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12630
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
12631 staticpro (&Qmenu_bar_update_hook);
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
12632 Qmenu_bar_update_hook = intern ("menu-bar-update-hook");
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
12633
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
12634 staticpro (&Qoverriding_terminal_local_map);
12267
e3421dcda014 Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents: 12263
diff changeset
12635 Qoverriding_terminal_local_map = intern ("overriding-terminal-local-map");
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
12636
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
12637 staticpro (&Qoverriding_local_map);
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
12638 Qoverriding_local_map = intern ("overriding-local-map");
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
12639
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
12640 staticpro (&Qwindow_scroll_functions);
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
12641 Qwindow_scroll_functions = intern ("window-scroll-functions");
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
12642
13584
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
12643 staticpro (&Qredisplay_end_trigger_functions);
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
12644 Qredisplay_end_trigger_functions = intern ("redisplay-end-trigger-functions");
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12645
21748
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
12646 staticpro (&Qinhibit_point_motion_hooks);
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
12647 Qinhibit_point_motion_hooks = intern ("inhibit-point-motion-hooks");
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
12648
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
12649 Qdisplay = intern ("display");
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12650 staticpro (&Qdisplay);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12651 Qspace_width = intern ("space-width");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12652 staticpro (&Qspace_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12653 Qheight = intern ("height");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12654 staticpro (&Qheight);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12655 Qraise = intern ("raise");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12656 staticpro (&Qraise);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12657 Qspace = intern ("space");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12658 staticpro (&Qspace);
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
12659 Qmargin = intern ("margin");
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
12660 staticpro (&Qmargin);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12661 Qleft_margin = intern ("left-margin");
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
12662 staticpro (&Qleft_margin);
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
12663 Qright_margin = intern ("right-margin");
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12664 staticpro (&Qright_margin);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12665 Qalign_to = intern ("align-to");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12666 staticpro (&Qalign_to);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12667 QCalign_to = intern (":align-to");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12668 staticpro (&QCalign_to);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12669 Qwidth = intern ("width");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12670 staticpro (&Qwidth);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12671 Qrelative_width = intern ("relative-width");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12672 staticpro (&Qrelative_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12673 QCrelative_width = intern (":relative-width");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12674 staticpro (&QCrelative_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12675 QCrelative_height = intern (":relative-height");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12676 staticpro (&QCrelative_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12677 QCeval = intern (":eval");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12678 staticpro (&QCeval);
25614
766b6a577f15 (Qwhen): Replaces QCwhen.
Gerd Moellmann <gerd@gnu.org>
parents: 25598
diff changeset
12679 Qwhen = intern ("when");
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
12680 staticpro (&Qwhen);
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
12681 QCfile = intern (":file");
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
12682 staticpro (&QCfile);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12683 Qfontified = intern ("fontified");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12684 staticpro (&Qfontified);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12685 Qfontification_functions = intern ("fontification-functions");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12686 staticpro (&Qfontification_functions);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12687 Qtrailing_whitespace = intern ("trailing-whitespace");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12688 staticpro (&Qtrailing_whitespace);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12689 Qimage = intern ("image");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12690 staticpro (&Qimage);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12691
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
12692 last_arrow_position = Qnil;
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
12693 last_arrow_string = Qnil;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12694 staticpro (&last_arrow_position);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12695 staticpro (&last_arrow_string);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12696
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12697 echo_buffer[0] = echo_buffer[1] = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12698 staticpro (&echo_buffer[0]);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12699 staticpro (&echo_buffer[1]);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12700
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12701 echo_area_buffer[0] = echo_area_buffer[1] = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12702 staticpro (&echo_area_buffer[0]);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12703 staticpro (&echo_area_buffer[1]);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12704
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
12705 DEFVAR_LISP ("show-trailing-whitespace", &Vshow_trailing_whitespace,
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
12706 "Non-nil means highlight trailing whitespace.\n\
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
12707 The face used for trailing whitespace is `trailing-whitespace'.");
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
12708 Vshow_trailing_whitespace = Qnil;
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
12709
22543
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
12710 DEFVAR_LISP ("inhibit-redisplay", &Vinhibit_redisplay,
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
12711 "Non-nil means don't actually do any redisplay.\n\
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
12712 This is used for internal purposes.");
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
12713 Vinhibit_redisplay = Qnil;
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
12714
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12715 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string,
782
a6d00bdb2b60 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 781
diff changeset
12716 "String (or mode line construct) included (normally) in `mode-line-format'.");
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12717 Vglobal_mode_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12718
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12719 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12720 "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
12721 This must be the beginning of a line in order to work.\n\
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12722 See also `overlay-arrow-string'.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12723 Voverlay_arrow_position = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12724
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12725 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12726 "String to display as an arrow. See also `overlay-arrow-position'.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12727 Voverlay_arrow_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12728
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12729 DEFVAR_INT ("scroll-step", &scroll_step,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12730 "*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
12731 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
12732 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
12733
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
12734 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively,
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
12735 "*Scroll up to this many lines, to bring point back on screen.");
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
12736 scroll_conservatively = 0;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
12737
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
12738 DEFVAR_INT ("scroll-margin", &scroll_margin,
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
12739 "*Number of lines of margin at the top and bottom of a window.\n\
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
12740 Recenter the window whenever point gets within this many lines\n\
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
12741 of the top or bottom of the window.");
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
12742 scroll_margin = 0;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
12743
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12744 #if GLYPH_DEBUG
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12745 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask");
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12746 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12747
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12748 DEFVAR_BOOL ("truncate-partial-width-windows",
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12749 &truncate_partial_width_windows,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
12750 "*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
12751 truncate_partial_width_windows = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12752
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12753 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12754 "*Non-nil means use inverse video for the mode line.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12755 mode_line_inverse_video = 1;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12756
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12757 DEFVAR_INT ("line-number-display-limit", &line_number_display_limit,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12758 "*Maximum buffer size for which line number should be displayed.\n\
20997
115d8c173aaf (syms_of_xdisp): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 20981
diff changeset
12759 If the buffer is bigger than this, the line number does not appear\n\
24928
516da11f702d (line-number-display-limit): Doc fix.
Andreas Schwab <schwab@suse.de>
parents: 24868
diff changeset
12760 in the mode line.");
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12761 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
12762
25258
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
12763 DEFVAR_INT ("line-number-display-limit-width", &line_number_display_limit_width,
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
12764 "*Maximum line width (in characters) for line number display.\n\
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
12765 If the average length of the lines near point is bigger than this, then the\n\
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
12766 line number may be omitted from the mode line.");
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
12767 line_number_display_limit_width = 200;
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
12768
3265
80f57ae8d44e (syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 3165
diff changeset
12769 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
12770 "*Non-nil means highlight region even in nonselected windows.");
17698
d9ba96fed821 (mark_window_display_accurate, redisplay_internal):
Richard M. Stallman <rms@gnu.org>
parents: 17679
diff changeset
12771 highlight_nonselected_windows = 0;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12773 DEFVAR_BOOL ("multiple-frames", &multiple_frames,
11767
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
12774 "Non-nil if more than one frame is visible on this display.\n\
4166c8ea623d (x_consider_frame_title): When setting multiple_frames,
Karl Heuer <kwzh@gnu.org>
parents: 11761
diff changeset
12775 Minibuffer-only frames don't count, but iconified frames do.\n\
12684
74e59068a948 (update_menu_bar): Pass new arg to set_frame_menubar.
Richard M. Stallman <rms@gnu.org>
parents: 12629
diff changeset
12776 This variable is not guaranteed to be accurate except while processing\n\
74e59068a948 (update_menu_bar): Pass new arg to set_frame_menubar.
Richard M. Stallman <rms@gnu.org>
parents: 12629
diff changeset
12777 `frame-title-format' and `icon-title-format'.");
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12778
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12779 DEFVAR_LISP ("frame-title-format", &Vframe_title_format,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12780 "Template for displaying the title bar of visible frames.\n\
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12781 \(Assuming the window manager supports this feature.)\n\
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12782 This variable has the same structure as `mode-line-format' (which see),\n\
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12783 and is used only on frames for which no explicit name has been set\n\
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12784 \(see `modify-frame-parameters').");
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12785 DEFVAR_LISP ("icon-title-format", &Vicon_title_format,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12786 "Template for displaying the title bar of an iconified frame.\n\
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12787 \(Assuming the window manager supports this feature.)\n\
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12788 This variable has the same structure as `mode-line-format' (which see),\n\
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12789 and is used only on frames for which no explicit name has been set\n\
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12790 \(see `modify-frame-parameters').");
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12791 Vicon_title_format
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12792 = Vframe_title_format
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12793 = Fcons (intern ("multiple-frames"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12794 Fcons (build_string ("%b"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12795 Fcons (Fcons (build_string (""),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12796 Fcons (intern ("invocation-name"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12797 Fcons (build_string ("@"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12798 Fcons (intern ("system-name"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12799 Qnil)))),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12800 Qnil)));
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
12801
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
12802 DEFVAR_LISP ("message-log-max", &Vmessage_log_max,
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
12803 "Maximum number of lines to keep in the message log buffer.\n\
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
12804 If nil, disable message logging. If t, log messages but don't truncate\n\
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
12805 the buffer when it becomes large.");
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
12806 XSETFASTINT (Vmessage_log_max, 50);
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
12807
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
12808 DEFVAR_LISP ("window-size-change-functions", &Vwindow_size_change_functions,
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
12809 "Functions called before redisplay, if window sizes have changed.\n\
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
12810 The value should be a list of functions that take one argument.\n\
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
12811 Just before redisplay, for each frame, if any of its windows have changed\n\
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
12812 size since the last redisplay, or have been split or deleted,\n\
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
12813 all the functions in the list are called, with the frame as argument.");
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
12814 Vwindow_size_change_functions = Qnil;
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
12815
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
12816 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12817 "List of Functions to call before redisplaying a window with scrolling.\n\
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
12818 Each function is called with two arguments, the window\n\
13196
95fbb5bd0a5a (syms_of_xdisp): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13188
diff changeset
12819 and its new display-start position. Note that the value of `window-end'\n\
95fbb5bd0a5a (syms_of_xdisp): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 13188
diff changeset
12820 is not valid when these functions are called.");
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
12821 Vwindow_scroll_functions = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12822
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12823 DEFVAR_BOOL ("auto-resize-tool-bars", &auto_resize_tool_bars_p,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12824 "*Non-nil means automatically resize tool-bars.\n\
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12825 This increases a tool-bar's height if not all tool-bar items are visible.\n\
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12826 It decreases a tool-bar's height when it would display blank lines\n\
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12827 otherwise.");
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12828 auto_resize_tool_bars_p = 1;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12829
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12830 DEFVAR_BOOL ("auto-raise-tool-bar-buttons", &auto_raise_tool_bar_buttons_p,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12831 "*Non-nil means raise tool-bar buttons when the mouse moves over them.");
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12832 auto_raise_tool_bar_buttons_p = 1;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12833
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12834 DEFVAR_INT ("tool-bar-button-margin", &tool_bar_button_margin,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12835 "*Margin around tool-bar buttons in pixels.");
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12836 tool_bar_button_margin = 1;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12837
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12838 DEFVAR_INT ("tool-bar-button-relief", &tool_bar_button_relief,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12839 "Relief thickness of tool-bar buttons.");
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
12840 tool_bar_button_relief = 3;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12841
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12842 DEFVAR_LISP ("fontification-functions", &Vfontification_functions,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12843 "List of functions to call to fontify regions of text.\n\
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12844 Each function is called with one argument POS. Functions must\n\
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12845 fontify a region starting at POS in the current buffer, and give\n\
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12846 fontified regions the property `fontified'.\n\
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12847 This variable automatically becomes buffer-local when set.");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12848 Vfontification_functions = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12849 Fmake_local_variable (Qfontification_functions);
24676
ba5632c9721a (display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents: 24557
diff changeset
12850
ba5632c9721a (display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents: 24557
diff changeset
12851 DEFVAR_BOOL ("unibyte-display-via-language-environment",
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12852 &unibyte_display_via_language_environment,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12853 "*Non-nil means display unibyte text according to language environment.\n\
24676
ba5632c9721a (display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents: 24557
diff changeset
12854 Specifically this means that unibyte non-ASCII characters\n\
ba5632c9721a (display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents: 24557
diff changeset
12855 are displayed by converting them to the equivalent multibyte characters\n\
ba5632c9721a (display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents: 24557
diff changeset
12856 according to the current language environment. As a result, they are\n\
ba5632c9721a (display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents: 24557
diff changeset
12857 displayed according to the current fontset.");
ba5632c9721a (display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents: 24557
diff changeset
12858 unibyte_display_via_language_environment = 0;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12859
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12860 DEFVAR_LISP ("max-mini-window-height", &Vmax_mini_window_height,
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12861 "*Maximum height for resizing mini-windows.\n\
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12862 If a float, it specifies a fraction of the mini-window frame's height.\n\
25403
5a3db5249db9 (resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents: 25394
diff changeset
12863 If an integer, it specifies a number of lines.\n\
5a3db5249db9 (resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents: 25394
diff changeset
12864 If nil, don't resize.");
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
12865 Vmax_mini_window_height = make_float (0.25);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12866 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12867
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12868
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12869 /* Initialize this module when Emacs starts. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12870
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21478
diff changeset
12871 void
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12872 init_xdisp ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12873 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12874 Lisp_Object root_window;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12875 struct window *mini_w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12876
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12877 CHARPOS (this_line_start_pos) = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12878
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12879 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
12880 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12881
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12882 if (!noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12883 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12884 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (root_window)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12885 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12886
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12887 XSETFASTINT (XWINDOW (root_window)->top, FRAME_TOP_MARGIN (f));
18458
96905485f262 (init_xdisp): Pay attention to FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents: 18184
diff changeset
12888 set_window_height (root_window,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12889 FRAME_HEIGHT (f) - 1 - FRAME_TOP_MARGIN (f),
18458
96905485f262 (init_xdisp): Pay attention to FRAME_MENU_BAR_LINES.
Richard M. Stallman <rms@gnu.org>
parents: 18184
diff changeset
12890 0);
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
12891 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12892 set_window_height (minibuf_window, 1, 0);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12893
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
12894 XSETFASTINT (XWINDOW (root_window)->width, FRAME_WIDTH (f));
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
12895 XSETFASTINT (mini_w->width, FRAME_WIDTH (f));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12896
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12897 scratch_glyph_row.glyphs[TEXT_AREA] = scratch_glyphs;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12898 scratch_glyph_row.glyphs[TEXT_AREA + 1]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12899 = scratch_glyphs + MAX_SCRATCH_GLYPHS;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12900
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12901 /* The default ellipsis glyphs `...'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12902 for (i = 0; i < 3; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12903 XSETFASTINT (default_invis_vector[i], '.');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12904 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12905
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12906 #ifdef HAVE_WINDOW_SYSTEM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12907 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12908 /* Allocate the buffer for frame titles. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12909 int size = 100;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12910 frame_title_buf = (char *) xmalloc (size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12911 frame_title_buf_end = frame_title_buf + size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12912 frame_title_ptr = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12913 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12914 #endif /* HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12915 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12916
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12917