annotate src/xdisp.c @ 33933:8fefc1be4352

Make the coding system no-conversion safe for all characters.
author Kenichi Handa <handa@m17n.org>
date Tue, 28 Nov 2000 00:01:52 +0000
parents 907c3073ae28
children a036721cfe80
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.
30697
0b56d5da235e (next_overlay_change): Update call to overlays_at.
Miles Bader <miles@gnu.org>
parents: 30675
diff changeset
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 97, 98, 99, 2000
25012
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"
31118
37c389d61cee Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30942
diff changeset
173 #include "keyboard.h"
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
174 #include "frame.h"
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
175 #include "window.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
176 #include "termchar.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
177 #include "dispextern.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
178 #include "buffer.h"
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
179 #include "charset.h"
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
180 #include "indent.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
181 #include "commands.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
182 #include "macros.h"
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
183 #include "disptab.h"
1718
f80c1f73f5b9 * xdisp.c: #include "termhooks.h".
Jim Blandy <jimb@redhat.com>
parents: 1656
diff changeset
184 #include "termhooks.h"
4386
abd79e187610 (try_window): Handle invisible newline at end of buffer.
Richard M. Stallman <rms@gnu.org>
parents: 3937
diff changeset
185 #include "intervals.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"
29433
fd1702d12671 Include fontset.h.
Dave Love <fx@gnu.org>
parents: 29291
diff changeset
189 #include "fontset.h"
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21478
diff changeset
190
21825
697991d2a2c4 Conditionally include xterm.h using HAVE_X_WINDOWS.
Geoff Voelker <voelker@cs.washington.edu>
parents: 21748
diff changeset
191 #ifdef HAVE_X_WINDOWS
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21478
diff changeset
192 #include "xterm.h"
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21478
diff changeset
193 #endif
27634
6c9ee29e8955 * dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
Andrew Innes <andrewi@gnu.org>
parents: 27540
diff changeset
194 #ifdef WINDOWSNT
6c9ee29e8955 * dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
Andrew Innes <andrewi@gnu.org>
parents: 27540
diff changeset
195 #include "w32term.h"
6c9ee29e8955 * dispextern.h: Change HAVE_X_WINDOWS to HAVE_WINDOW_SYSTEM,
Andrew Innes <andrewi@gnu.org>
parents: 27540
diff changeset
196 #endif
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
197 #ifdef macintosh
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
198 #include "macterm.h"
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
199 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
200
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
201 #define min(a, b) ((a) < (b) ? (a) : (b))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
202 #define max(a, b) ((a) > (b) ? (a) : (b))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
203
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
204 #define INFINITY 10000000
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
205
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
206 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh)
30320
a1f02a10e391 (with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents: 30243
diff changeset
207 extern void set_frame_menubar P_ ((struct frame *f, int, int));
15813
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
208 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
209 #endif
4e3a6baa4750 (display_menu_bar): Add USE_X_TOOLKIT conditional.
Richard M. Stallman <rms@gnu.org>
parents: 5340
diff changeset
210
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
211 extern int interrupt_input;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
212 extern int command_loop_level;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
213
16660
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
214 extern int minibuffer_auto_raise;
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
215
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
216 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
217
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
218 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
219 extern Lisp_Object Voverriding_local_map_menu_flag;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
220 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
221
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
222 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
223 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
224 Lisp_Object Qredisplay_end_trigger_functions;
21748
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
225 Lisp_Object Qinhibit_point_motion_hooks;
28002
694ac11a3e1c (QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 27990
diff changeset
226 Lisp_Object QCeval, Qwhen, QCfile, QCdata;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
227 Lisp_Object Qfontified;
33314
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
228 Lisp_Object Qgrow_only;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
229
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
230 /* Functions called to fontify regions of text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
231
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
232 Lisp_Object Vfontification_functions;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
233 Lisp_Object Qfontification_functions;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
234
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
235 /* 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
236 over them. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
237
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
238 int auto_raise_tool_bar_buttons_p;
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 /* Margin around tool bar buttons in pixels. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
241
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
242 int tool_bar_button_margin;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
243
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
244 /* Thickness of shadow to draw around tool bar buttons. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
245
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
246 int tool_bar_button_relief;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
247
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
248 /* 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
249 items are visible, and no blank lines remain. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
250
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
251 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
252
22543
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
253 /* 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
254
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
255 Lisp_Object Vinhibit_redisplay, Qinhibit_redisplay;
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
256
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
257 /* Names of text properties relevant for redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
258
26570
133c30f0647c Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents: 26447
diff changeset
259 Lisp_Object Qdisplay, Qrelative_width, Qalign_to;
133c30f0647c Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents: 26447
diff changeset
260 extern Lisp_Object Qface, Qinvisible, Qimage, Qwidth;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
261
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
262 /* Symbols used in text property values. */
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 Lisp_Object Qspace, QCalign_to, QCrelative_width, QCrelative_height;
26570
133c30f0647c Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents: 26447
diff changeset
265 Lisp_Object Qleft_margin, Qright_margin, Qspace_width, Qraise;
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
266 Lisp_Object Qmargin;
26570
133c30f0647c Don't duplicate Qheight, Qwidth definitions done elsewhere.
Dave Love <fx@gnu.org>
parents: 26447
diff changeset
267 extern Lisp_Object Qheight;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
268
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
269 /* Non-nil means highlight trailing whitespace. */
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
270
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
271 Lisp_Object Vshow_trailing_whitespace;
25012
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 /* Name of the face used to highlight trailing whitespace. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
274
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
275 Lisp_Object Qtrailing_whitespace;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
276
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
277 /* 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
278 images in Lisp. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
279
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
280 Lisp_Object Qimage;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
281
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
282 /* Non-zero means print newline to stdout before next mini-buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
283 message. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
284
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
285 int noninteractive_need_newline;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
286
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
287 /* 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
288
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
289 static int message_log_need_newline;
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
290
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
291
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
292 /* The buffer position of the first character appearing entirely or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
293 partially on the line of the selected window which contains the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
294 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
295 redisplay optimization in redisplay_internal. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
296
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
297 static struct text_pos this_line_start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
298
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
299 /* Number of characters past the end of the line above, including the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
300 terminating newline. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
301
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
302 static struct text_pos this_line_end_pos;
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 /* The vertical positions and the height of this line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
305
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
306 static int this_line_vpos;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
307 static int this_line_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
308 static int this_line_pixel_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
309
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
310 /* X position at which this display line starts. Usually zero;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
311 negative if first character is partially visible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
312
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
313 static int this_line_start_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
314
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
315 /* Buffer that this_line_.* variables are referring to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
316
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
317 static struct buffer *this_line_buffer;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
318
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
319 /* Nonzero means truncate lines in all windows less wide than the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
320 frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
321
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
322 int truncate_partial_width_windows;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
323
24676
ba5632c9721a (display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents: 24557
diff changeset
324 /* A flag to control how to display unibyte 8-bit character. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
325
24676
ba5632c9721a (display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents: 24557
diff changeset
326 int unibyte_display_via_language_environment;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
327
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
328 /* Nonzero means we have more than one non-mini-buffer-only frame.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
329 Not guaranteed to be accurate except while parsing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
330 frame-title-format. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
331
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
332 int multiple_frames;
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
333
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
334 Lisp_Object Vglobal_mode_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
335
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
336 /* 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
337
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
338 Lisp_Object Voverlay_arrow_position;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
339
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
340 /* String to display for the arrow. Only used on terminal frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
341
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
342 Lisp_Object Voverlay_arrow_string;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
343
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
344 /* Values of those variables at last redisplay. However, if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
345 Voverlay_arrow_position is a marker, last_arrow_position is its
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
346 numerical position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
347
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
348 static Lisp_Object last_arrow_position, last_arrow_string;
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
349
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
350 /* 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
351
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
352 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
353
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
354 /* 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
355
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
356 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
357
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
358 /* 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
359 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
360 have changed. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
361
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
362 static Lisp_Object Vwindow_size_change_functions;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
363
31845
4bdcc0f0232f (syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents: 31826
diff changeset
364 Lisp_Object Qmenu_bar_update_hook, Vmenu_bar_update_hook;
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
365
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
366 /* Nonzero if overlay arrow has been displayed once in this window. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
367
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
368 static int overlay_arrow_seen;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
369
3265
80f57ae8d44e (syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 3165
diff changeset
370 /* Nonzero means highlight the region even in nonselected windows. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
371
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
372 int highlight_nonselected_windows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
373
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
374 /* If cursor motion alone moves point off frame, try scrolling this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
375 many lines up or down if that will bring it back. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
376
11719
9238e21a6f09 (prepare_menu_bars): Clear size-change flag before running
Richard M. Stallman <rms@gnu.org>
parents: 11649
diff changeset
377 static int scroll_step;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
378
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
379 /* 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
380 screen, when appropriate. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
381
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
382 static int scroll_conservatively;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
383
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
384 /* Recenter the window whenever point gets within this many lines of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
385 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
386 pixel value by multiplying it with CANON_Y_UNIT, which means that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
387 there is really a fixed pixel height scroll margin. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
388
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
389 int scroll_margin;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
390
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
391 /* Number of windows showing the buffer of the selected window (or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
392 another buffer with the same base buffer). keyboard.c refers to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
393 this. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
394
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
395 int buffer_shared;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
396
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
397 /* Vector containing glyphs for an ellipsis `...'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
398
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
399 static Lisp_Object default_invis_vector[3];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
400
33840
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
401 /* Zero means display the mode-line/header-line/menu-bar in the default face
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
402 (this slightly odd definition is for compatibility with previous versions
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
403 of emacs), non-zero means display them using their respective faces.
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
404
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
405 This variable is deprecated. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
406
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
407 int mode_line_inverse_video;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
408
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
409 /* Prompt to display in front of the mini-buffer contents. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
410
7951
e609577aa2f3 minibuf_prompt is now a Lisp_Object.
Karl Heuer <kwzh@gnu.org>
parents: 7933
diff changeset
411 Lisp_Object minibuf_prompt;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
412
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
413 /* Width of current mini-buffer prompt. Only set after display_line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
414 of the line that contains the prompt. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
415
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
416 int minibuf_prompt_width;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
417 int minibuf_prompt_pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
418
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
419 /* This is the window where the echo area message was displayed. It
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
420 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
421 currently active as a mini-buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
422
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
423 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
424
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
425 /* 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
426 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
427 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
428 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
429
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
430 Lisp_Object Vmessage_stack;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
431
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
432 /* 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
433 message was specified. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
434
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
435 int message_enable_multibyte;
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
436
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
437 /* True if we should redraw the mode lines on the next redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
438
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
439 int update_mode_lines;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
440
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
441 /* Nonzero if window sizes or contents have changed since last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
442 redisplay that finished */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
443
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
444 int windows_or_buffers_changed;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
445
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
446 /* 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
447 line number. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
448
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
449 int line_number_displayed;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
450
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
451 /* Maximum buffer size for which to display line numbers. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
452
29632
96d83d5a48b3 (Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 29515
diff changeset
453 Lisp_Object Vline_number_display_limit;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
454
25258
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
455 /* 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
456
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
457 static int line_number_display_limit_width;
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
458
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
459 /* Number of lines to keep in the message log buffer. t means
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
460 infinite. nil means don't log at all. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
461
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
462 Lisp_Object Vmessage_log_max;
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
463
30728
a87e28789082 (Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30721
diff changeset
464 /* The name of the *Messages* buffer, a string. */
a87e28789082 (Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30721
diff changeset
465
a87e28789082 (Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30721
diff changeset
466 static Lisp_Object Vmessages_buffer_name;
a87e28789082 (Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30721
diff changeset
467
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
468 /* 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
469 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
470
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
471 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
472
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
473 /* 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
474
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
475 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
476
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
477 /* 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
478
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
479 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
480
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
481 /* 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
482 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
483
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
484 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
485
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
486 /* 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
487 message. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
488
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
489 int message_buf_print;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
490
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
491 /* 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
492 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
493 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
494
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
495 Lisp_Object Vmax_mini_window_height;
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
496
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
497 /* Non-zero means messages should be displayed with truncated
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
498 lines instead of being continued. */
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
499
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
500 int message_truncate_lines;
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
501 Lisp_Object Qmessage_truncate_lines;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
502
27843
d401b5066063 (cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27721
diff changeset
503 /* Non-zero means we want a hollow cursor in windows that are not
d401b5066063 (cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27721
diff changeset
504 selected. Zero means there's no cursor in such windows. */
d401b5066063 (cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27721
diff changeset
505
d401b5066063 (cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27721
diff changeset
506 int cursor_in_non_selected_windows;
d401b5066063 (cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27721
diff changeset
507
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
508 /* A scratch glyph row with contents used for generating truncation
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
509 glyphs. Also used in direct_output_for_insert. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
510
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
511 #define MAX_SCRATCH_GLYPHS 100
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
512 struct glyph_row scratch_glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
513 static struct glyph scratch_glyphs[MAX_SCRATCH_GLYPHS];
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 /* Ascent and height of the last line processed by move_it_to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
516
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
517 static int last_max_ascent, last_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
518
31876
de16d989722a (help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31849
diff changeset
519 /* Non-zero if there's a help-echo in the echo area. */
de16d989722a (help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31849
diff changeset
520
de16d989722a (help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31849
diff changeset
521 int help_echo_showing_p;
de16d989722a (help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31849
diff changeset
522
33462
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
523 /* If >= 0, computed, exact values of mode-line and header-line height
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
524 to use in the macros CURRENT_MODE_LINE_HEIGHT and
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
525 CURRENT_HEADER_LINE_HEIGHT. */
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
526
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
527 int current_mode_line_height, current_header_line_height;
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
528
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
529 /* The maximum distance to look ahead for text properties. Values
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
530 that are too small let us call compute_char_face and similar
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
531 functions too often which is expensive. Values that are too large
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
532 let us call compute_char_face and alike too often because we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
533 might not be interested in text properties that far away. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
534
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
535 #define TEXT_PROP_DISTANCE_LIMIT 100
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
536
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
537 #if GLYPH_DEBUG
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
538
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
539 /* Non-zero means print traces of redisplay if compiled with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
540 GLYPH_DEBUG != 0. */
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 int trace_redisplay_p;
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
543
31118
37c389d61cee Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30942
diff changeset
544 #endif /* GLYPH_DEBUG */
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
545
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
546 #ifdef DEBUG_TRACE_MOVE
31118
37c389d61cee Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30942
diff changeset
547 /* Non-zero means trace with TRACE_MOVE to stderr. */
37c389d61cee Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30942
diff changeset
548 int trace_move;
37c389d61cee Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30942
diff changeset
549
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
550 #define TRACE_MOVE(x) if (trace_move) fprintf x; else (void) 0
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
551 #else
30747
6c7afd50ec6a (TRACE_MOVE) [GLYPH_DEBUG]: Delete the last semicolon.
Kenichi Handa <handa@m17n.org>
parents: 30744
diff changeset
552 #define TRACE_MOVE(x) (void) 0
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
553 #endif
31118
37c389d61cee Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents: 30942
diff changeset
554
28692
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
555 /* Non-zero means automatically scroll windows horizontally to make
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
556 point visible. */
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
557
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
558 int automatic_hscrolling_p;
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
559
28984
540ca0531c77 (Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 28932
diff changeset
560 /* A list of symbols, one for each supported image type. */
540ca0531c77 (Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 28932
diff changeset
561
540ca0531c77 (Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 28932
diff changeset
562 Lisp_Object Vimage_types;
540ca0531c77 (Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 28932
diff changeset
563
33314
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
564 /* The variable `resize-mini-windows'. If nil, don't resize
33453
79e5d8c30cf2 Fix a typo in a comment.
Eli Zaretskii <eliz@gnu.org>
parents: 33314
diff changeset
565 mini-windows. If t, always resize them to fit the text they
33314
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
566 display. If `grow-only', let mini-windows grow only until they
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
567 become empty. */
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
568
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
569 Lisp_Object Vresize_mini_windows;
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
570
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
571 /* Value returned from text property handlers (see below). */
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 enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
574 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
575 HANDLED_NORMALLY,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
576 HANDLED_RECOMPUTE_PROPS,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
577 HANDLED_OVERLAY_STRING_CONSUMED,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
578 HANDLED_RETURN
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 /* A description of text properties that redisplay is interested
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
582 in. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
583
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
584 struct props
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
585 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
586 /* The name of the property. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
587 Lisp_Object *name;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
588
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
589 /* A unique index for the property. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
590 enum prop_idx idx;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
591
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
592 /* A handler function called to set up iterator IT from the property
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
593 at IT's current position. Value is used to steer handle_stop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
594 enum prop_handled (*handler) P_ ((struct it *it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
595 };
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
596
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
597 static enum prop_handled handle_face_prop P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
598 static enum prop_handled handle_invisible_prop P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
599 static enum prop_handled handle_display_prop P_ ((struct it *));
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
600 static enum prop_handled handle_composition_prop P_ ((struct it *));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
601 static enum prop_handled handle_overlay_change P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
602 static enum prop_handled handle_fontified_prop P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
603
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
604 /* Properties handled by iterators. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
605
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
606 static struct props it_props[] =
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
607 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
608 {&Qfontified, FONTIFIED_PROP_IDX, handle_fontified_prop},
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
609 /* Handle `face' before `display' because some sub-properties of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
610 `display' need to know the face. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
611 {&Qface, FACE_PROP_IDX, handle_face_prop},
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
612 {&Qdisplay, DISPLAY_PROP_IDX, handle_display_prop},
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
613 {&Qinvisible, INVISIBLE_PROP_IDX, handle_invisible_prop},
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
614 {&Qcomposition, COMPOSITION_PROP_IDX, handle_composition_prop},
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
615 {NULL, 0, NULL}
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
616 };
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
617
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
618 /* 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
619 the marker_position of X. Otherwise, value is X. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
620
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
621 #define COERCE_MARKER(X) (MARKERP ((X)) ? Fmarker_position (X) : (X))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
622
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
623 /* Enumeration returned by some move_it_.* functions internally. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
624
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
625 enum move_it_result
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
626 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
627 /* Not used. Undefined value. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
628 MOVE_UNDEFINED,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
629
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
630 /* Move ended at the requested buffer position or ZV. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
631 MOVE_POS_MATCH_OR_ZV,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
632
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
633 /* Move ended at the requested X pixel position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
634 MOVE_X_REACHED,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
635
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
636 /* 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
637 continued. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
638 MOVE_LINE_CONTINUED,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
639
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
640 /* 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
641 be displayed truncated. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
642 MOVE_LINE_TRUNCATED,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
643
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
644 /* Move within a line ended at a line end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
645 MOVE_NEWLINE_OR_CR
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
646 };
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
647
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
648
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
649
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
650 /* Function prototypes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
651
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
652 static int cursor_row_p P_ ((struct window *, struct glyph_row *));
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
653 static int redisplay_mode_lines P_ ((Lisp_Object, int));
30320
a1f02a10e391 (with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents: 30243
diff changeset
654 static char *decode_mode_spec_coding P_ ((Lisp_Object, char *, int));
a1f02a10e391 (with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents: 30243
diff changeset
655 static int invisible_text_between_p P_ ((struct it *, int, int));
a1f02a10e391 (with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents: 30243
diff changeset
656 static int next_element_from_ellipsis P_ ((struct it *));
a1f02a10e391 (with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents: 30243
diff changeset
657 static void pint2str P_ ((char *, int, int));
a1f02a10e391 (with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents: 30243
diff changeset
658 static struct text_pos run_window_scroll_functions P_ ((Lisp_Object,
a1f02a10e391 (with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents: 30243
diff changeset
659 struct text_pos));
a1f02a10e391 (with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents: 30243
diff changeset
660 static void reconsider_clip_changes P_ ((struct window *, struct buffer *));
a1f02a10e391 (with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents: 30243
diff changeset
661 static int text_outside_line_unchanged_p P_ ((struct window *, int, int));
a1f02a10e391 (with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents: 30243
diff changeset
662 static void store_frame_title_char P_ ((char));
a1f02a10e391 (with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents: 30243
diff changeset
663 static int store_frame_title P_ ((unsigned char *, int, int));
a1f02a10e391 (with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents: 30243
diff changeset
664 static void x_consider_frame_title P_ ((Lisp_Object));
a1f02a10e391 (with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents: 30243
diff changeset
665 static void handle_stop P_ ((struct it *));
a1f02a10e391 (with_echo_area_buffer): Call FN with more arguments.
Gerd Moellmann <gerd@gnu.org>
parents: 30243
diff changeset
666 static int tool_bar_lines_needed P_ ((struct frame *));
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
667 static int single_display_prop_intangible_p P_ ((Lisp_Object));
26447
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
668 static void ensure_echo_area_buffers P_ ((void));
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
669 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
670 struct glyph_row *,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
671 struct glyph_row *));
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
672 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
673 static Lisp_Object with_echo_area_buffer_unwind_data P_ ((struct window *));
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
674 static int with_echo_area_buffer P_ ((struct window *, int,
30675
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
675 int (*) (EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT),
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
676 EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT));
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
677 static void clear_garbaged_frames P_ ((void));
30675
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
678 static int current_message_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT));
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
679 static int truncate_message_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT));
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
680 static int set_message_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT));
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
681 static int display_echo_area P_ ((struct window *));
30675
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
682 static int display_echo_area_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT));
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
683 static int resize_mini_window_1 P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT));
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
684 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
685 static int string_char_and_length P_ ((unsigned char *, int, int *));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
686 static struct text_pos display_prop_end P_ ((struct it *, Lisp_Object,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
687 struct text_pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
688 static int compute_window_start_on_continuation_line P_ ((struct window *));
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
689 static Lisp_Object safe_eval_handler P_ ((Lisp_Object));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
690 static void insert_left_trunc_glyphs P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
691 static struct glyph_row *get_overlay_arrow_glyph_row P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
692 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
693 static int append_space P_ ((struct it *, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
694 static void make_cursor_line_fully_visible P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
695 static int try_scrolling P_ ((Lisp_Object, int, int, int, int));
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
696 static int try_cursor_movement P_ ((Lisp_Object, struct text_pos, int *));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
697 static int trailing_whitespace_p P_ ((int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
698 static int message_log_check_duplicate P_ ((int, int, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
699 int invisible_p P_ ((Lisp_Object, Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
700 int invisible_ellipsis_p P_ ((Lisp_Object, Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
701 static void push_it P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
702 static void pop_it P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
703 static void sync_frame_with_window_matrix_rows P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
704 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
705 static int echo_area_display P_ ((int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
706 static void redisplay_windows P_ ((Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
707 static void redisplay_window P_ ((Lisp_Object, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
708 static void update_menu_bar P_ ((struct frame *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
709 static int try_window_reusing_current_matrix P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
710 static int try_window_id P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
711 static int display_line P_ ((struct it *));
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
712 static int display_mode_lines P_ ((struct window *));
33462
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
713 static int display_mode_line P_ ((struct window *, enum face_id, Lisp_Object));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
714 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
715 static char *decode_mode_spec P_ ((struct window *, int, int, int));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
716 static void display_menu_bar P_ ((struct window *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
717 static int display_count_lines P_ ((int, int, int, int, int *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
718 static int display_string P_ ((unsigned char *, Lisp_Object, Lisp_Object,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
719 int, int, struct it *, int, int, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
720 static void compute_line_metrics P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
721 static void run_redisplay_end_trigger_hook P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
722 static int get_overlay_strings P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
723 static void next_overlay_string P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
724 static void reseat P_ ((struct it *, struct text_pos, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
725 static void reseat_1 P_ ((struct it *, struct text_pos, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
726 static void back_to_previous_visible_line_start P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
727 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
728 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
729 static int next_element_from_display_vector P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
730 static int next_element_from_string P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
731 static int next_element_from_c_string P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
732 static int next_element_from_buffer P_ ((struct it *));
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
733 static int next_element_from_composition P_ ((struct it *));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
734 static int next_element_from_image P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
735 static int next_element_from_stretch P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
736 static void load_overlay_strings P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
737 static void init_from_display_pos P_ ((struct it *, struct window *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
738 struct display_pos *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
739 static void reseat_to_string P_ ((struct it *, unsigned char *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
740 Lisp_Object, int, int, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
741 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
742 int, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
743 void move_it_vertically_backward P_ ((struct it *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
744 static void init_to_row_start P_ ((struct it *, struct window *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
745 struct glyph_row *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
746 static void init_to_row_end P_ ((struct it *, struct window *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
747 struct glyph_row *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
748 static void back_to_previous_line_start P_ ((struct it *));
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
749 static int forward_to_next_line_start P_ ((struct it *, int *));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
750 static struct text_pos string_pos_nchars_ahead P_ ((struct text_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
751 Lisp_Object, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
752 static struct text_pos string_pos P_ ((int, Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
753 static struct text_pos c_string_pos P_ ((int, unsigned char *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
754 static int number_of_chars P_ ((unsigned char *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
755 static void compute_stop_pos P_ ((struct it *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
756 static void compute_string_pos P_ ((struct text_pos *, struct text_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
757 Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
758 static int face_before_or_after_it_pos P_ ((struct it *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
759 static int next_overlay_change P_ ((int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
760 static int handle_single_display_prop P_ ((struct it *, Lisp_Object,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
761 Lisp_Object, struct text_pos *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
762
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
763 #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
764 #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
765
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
766 #ifdef HAVE_WINDOW_SYSTEM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
767
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
768 static void update_tool_bar P_ ((struct frame *, int));
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
769 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
770 static int redisplay_tool_bar P_ ((struct frame *));
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
771 static void display_tool_bar_line P_ ((struct it *));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
772
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
773 #endif /* HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
774
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 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
777 Window display dimensions
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
780 /* Return the window-relative maximum y + 1 for glyph rows displaying
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
781 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
782 mode line, if any. */
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 INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
785 window_text_bottom_y (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
786 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
787 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
788 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
789 int height = XFASTINT (w->height) * CANON_Y_UNIT (f);
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
790
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
791 if (WINDOW_WANTS_MODELINE_P (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
792 height -= CURRENT_MODE_LINE_HEIGHT (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
793 return height;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
796
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
797 /* 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
798 means return the total width of W, not including bitmap areas to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
799 the left and right of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
800
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
801 INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
802 window_box_width (w, area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
803 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
804 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
805 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
806 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
807 int width = XFASTINT (w->width);
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 if (!w->pseudo_window_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
810 {
25463
255017b70168 (window_box_width): Use FRAME_FLAGS_AREA_COLS instead of
Gerd Moellmann <gerd@gnu.org>
parents: 25403
diff changeset
811 width -= FRAME_SCROLL_BAR_WIDTH (f) + FRAME_FLAGS_AREA_COLS (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
812
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
813 if (area == TEXT_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
814 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
815 if (INTEGERP (w->left_margin_width))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
816 width -= XFASTINT (w->left_margin_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
817 if (INTEGERP (w->right_margin_width))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
818 width -= XFASTINT (w->right_margin_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
819 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
820 else if (area == LEFT_MARGIN_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
821 width = (INTEGERP (w->left_margin_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
822 ? XFASTINT (w->left_margin_width) : 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
823 else if (area == RIGHT_MARGIN_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
824 width = (INTEGERP (w->right_margin_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
825 ? XFASTINT (w->right_margin_width) : 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
826 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
827
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
828 return width * CANON_X_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
829 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
830
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 /* Return the pixel height of the display area of window W, not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
833 including mode lines of W, if any.. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
834
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
835 INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
836 window_box_height (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
837 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
838 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
839 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
840 int height = XFASTINT (w->height) * CANON_Y_UNIT (f);
31931
85c245edb7d7 (window_box_height): Add an assertion.
Gerd Moellmann <gerd@gnu.org>
parents: 31876
diff changeset
841
85c245edb7d7 (window_box_height): Add an assertion.
Gerd Moellmann <gerd@gnu.org>
parents: 31876
diff changeset
842 xassert (height >= 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
843
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
844 if (WINDOW_WANTS_MODELINE_P (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
845 height -= CURRENT_MODE_LINE_HEIGHT (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
846
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
847 if (WINDOW_WANTS_HEADER_LINE_P (w))
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
848 height -= CURRENT_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
849
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
850 return height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
851 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
852
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 /* Return the frame-relative coordinate of the left edge of display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
855 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
856 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
857 W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
858
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
859 INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
860 window_box_left (w, area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
861 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
862 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
863 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
864 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
865 int x = FRAME_INTERNAL_BORDER_WIDTH_SAFE (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
866
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
867 if (!w->pseudo_window_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
868 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
869 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
870 + FRAME_LEFT_FLAGS_AREA_WIDTH (f));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
871
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
872 if (area == TEXT_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
873 x += window_box_width (w, LEFT_MARGIN_AREA);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
874 else if (area == RIGHT_MARGIN_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
875 x += (window_box_width (w, LEFT_MARGIN_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
876 + window_box_width (w, TEXT_AREA));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
877 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
878
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
879 return x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
880 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
881
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
882
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
883 /* Return the frame-relative coordinate of the right edge of display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
884 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
885 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
886 W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
887
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
888 INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
889 window_box_right (w, area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
890 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
891 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
892 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
893 return window_box_left (w, area) + window_box_width (w, area);
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
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 /* 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
898 mode lines, in frame-relative coordinates. AREA < 0 means the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
899 whole window, not including bitmap areas to the left and right of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
900 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
901 coordinates of the upper-left corner of the box. Return in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
902 *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
903
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
904 INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
905 window_box (w, area, box_x, box_y, box_width, box_height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
906 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
907 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
908 int *box_x, *box_y, *box_width, *box_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
909 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
910 struct frame *f = XFRAME (w->frame);
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 *box_width = window_box_width (w, area);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
913 *box_height = window_box_height (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
914 *box_x = window_box_left (w, area);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
915 *box_y = (FRAME_INTERNAL_BORDER_WIDTH_SAFE (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
916 + XFASTINT (w->top) * CANON_Y_UNIT (f));
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
917 if (WINDOW_WANTS_HEADER_LINE_P (w))
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
918 *box_y += CURRENT_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
919 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
920
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 /* 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
923 mode lines. AREA < 0 means the whole window, not including bitmap
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
924 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
925 and TOP_LEFT_Y the frame-relative pixel coordinates of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
926 upper-left corner of the box. Return in *BOTTOM_RIGHT_X, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
927 *BOTTOM_RIGHT_Y the coordinates of the bottom-right corner of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
928 box. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
929
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
930 INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
931 window_box_edges (w, area, top_left_x, top_left_y,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
932 bottom_right_x, bottom_right_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
933 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
934 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
935 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
936 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
937 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
938 bottom_right_y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
939 *bottom_right_x += *top_left_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
940 *bottom_right_y += *top_left_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
941 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
942
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
943
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 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
946 Utilities
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
947 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
948
33510
405f162f1fc7 (pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents: 33490
diff changeset
949 /* Return 1 if position CHARPOS is visible in window W. Set *FULLY to
405f162f1fc7 (pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents: 33490
diff changeset
950 1 if POS is visible and the line containing POS is fully visible.
405f162f1fc7 (pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents: 33490
diff changeset
951 EXACT_MODE_LINE_HEIGHTS_P non-zero means compute exact mode-line
405f162f1fc7 (pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents: 33490
diff changeset
952 and header-lines heights. */
32873
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
953
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
954 int
33462
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
955 pos_visible_p (w, charpos, fully, exact_mode_line_heights_p)
32873
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
956 struct window *w;
33462
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
957 int charpos, *fully, exact_mode_line_heights_p;
32873
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
958 {
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
959 struct it it;
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
960 struct text_pos top;
32912
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
961 int visible_p;
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
962 struct buffer *old_buffer = NULL;
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
963
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
964 if (XBUFFER (w->buffer) != current_buffer)
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
965 {
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
966 old_buffer = current_buffer;
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
967 set_buffer_internal_1 (XBUFFER (w->buffer));
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
968 }
32873
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
969
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
970 *fully = visible_p = 0;
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
971 SET_TEXT_POS_FROM_MARKER (top, w->start);
33462
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
972
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
973 /* Compute exact mode line heights, if requested. */
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
974 if (exact_mode_line_heights_p)
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
975 {
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
976 if (WINDOW_WANTS_MODELINE_P (w))
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
977 current_mode_line_height
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
978 = display_mode_line (w, MODE_LINE_FACE_ID,
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
979 current_buffer->mode_line_format);
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
980
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
981 if (WINDOW_WANTS_HEADER_LINE_P (w))
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
982 current_header_line_height
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
983 = display_mode_line (w, HEADER_LINE_FACE_ID,
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
984 current_buffer->header_line_format);
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
985 }
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
986
32873
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
987 start_display (&it, w, top);
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
988 move_it_to (&it, charpos, 0, it.last_visible_y, -1,
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
989 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y);
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
990
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
991 if (IT_CHARPOS (it) == charpos)
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
992 {
32912
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
993 int line_height, line_bottom_y;
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
994 int line_top_y = it.current_y;
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
995 int window_top_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
996
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
997 line_height = it.max_ascent + it.max_descent;
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
998 if (line_height == 0)
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
999 {
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1000 if (last_height)
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1001 line_height = last_height;
33531
de985bc39ea3 (pos_visible_p): Handle case that we reach ZV without
Gerd Moellmann <gerd@gnu.org>
parents: 33510
diff changeset
1002 else if (charpos < ZV)
32912
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1003 {
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1004 move_it_by_lines (&it, 1, 1);
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1005 line_height = (it.max_ascent || it.max_descent
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1006 ? it.max_ascent + it.max_descent
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1007 : last_height);
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1008 }
33568
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1009 else
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1010 {
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1011 /* Use the default character height. */
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1012 it.what = IT_CHARACTER;
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1013 it.c = ' ';
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1014 it.len = 1;
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1015 PRODUCE_GLYPHS (&it);
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1016 line_height = it.ascent + it.descent;
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1017 }
32912
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1018 }
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1019 line_bottom_y = line_top_y + line_height;
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1020
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1021 if (line_top_y < window_top_y)
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1022 visible_p = line_bottom_y > window_top_y;
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1023 else if (line_top_y < it.last_visible_y)
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1024 {
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1025 visible_p = 1;
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1026 *fully = line_bottom_y <= it.last_visible_y;
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1027 }
32873
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1028 }
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1029 else if (it.current_y + it.max_ascent + it.max_descent > it.last_visible_y)
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1030 {
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1031 move_it_by_lines (&it, 1, 0);
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1032 if (charpos < IT_CHARPOS (it))
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1033 {
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1034 visible_p = 1;
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1035 *fully = 0;
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1036 }
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1037 }
32912
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1038
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1039 if (old_buffer)
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1040 set_buffer_internal_1 (old_buffer);
33462
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
1041
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
1042 current_header_line_height = current_mode_line_height = -1;
32873
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1043 return visible_p;
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1044 }
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1045
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1046
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1047 /* 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
1048 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
1049 STRING_CHAR_AND_LENGTH but never returns an invalid character. If
28932
f8b0ac62f238 Use the term `invalid' instead of `illegal'.
Gerd Moellmann <gerd@gnu.org>
parents: 28876
diff changeset
1050 we find one, we return a `?', but with the length of the invalid
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1051 character. */
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1052
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1053 static INLINE int
25098
188fc8b67ea9 (string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents: 25096
diff changeset
1054 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
1055 unsigned char *str;
25098
188fc8b67ea9 (string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents: 25096
diff changeset
1056 int maxlen, *len;
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1057 {
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1058 int c;
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1059
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1060 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
1061 if (!CHAR_VALID_P (c, 1))
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1062 /* We may not change the length here because other places in Emacs
28932
f8b0ac62f238 Use the term `invalid' instead of `illegal'.
Gerd Moellmann <gerd@gnu.org>
parents: 28876
diff changeset
1063 don't use this function, i.e. they silently accept invalid
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1064 characters. */
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1065 c = '?';
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1066
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1067 return c;
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1068 }
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1069
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1070
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1071
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1072 /* Given a position POS containing a valid character and byte position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1073 in STRING, return the position NCHARS ahead (NCHARS >= 0). */
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 static struct text_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1076 string_pos_nchars_ahead (pos, string, nchars)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1077 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1078 Lisp_Object string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1079 int nchars;
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 xassert (STRINGP (string) && nchars >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1082
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1083 if (STRING_MULTIBYTE (string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1084 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1085 int rest = STRING_BYTES (XSTRING (string)) - BYTEPOS (pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1086 unsigned char *p = XSTRING (string)->data + BYTEPOS (pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1087 int len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1088
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1089 while (nchars--)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1090 {
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1091 string_char_and_length (p, rest, &len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1092 p += len, rest -= len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1093 xassert (rest >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1094 CHARPOS (pos) += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1095 BYTEPOS (pos) += len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1096 }
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1099 SET_TEXT_POS (pos, CHARPOS (pos) + nchars, BYTEPOS (pos) + nchars);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1100
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1101 return pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1102 }
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 /* Value is the text position, i.e. character and byte position,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1106 for character position CHARPOS in STRING. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1107
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1108 static INLINE struct text_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1109 string_pos (charpos, string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1110 int charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1111 Lisp_Object string;
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 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1114 xassert (STRINGP (string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1115 xassert (charpos >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1116 SET_TEXT_POS (pos, charpos, string_char_to_byte (string, charpos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1117 return pos;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1120
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1121 /* Value is a text position, i.e. character and byte position, for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1122 character position CHARPOS in C string S. MULTIBYTE_P non-zero
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1123 means recognize multibyte characters. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1124
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1125 static struct text_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1126 c_string_pos (charpos, s, multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1127 int charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1128 unsigned char *s;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1129 int multibyte_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1130 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1131 struct text_pos pos;
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 xassert (s != NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1134 xassert (charpos >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1135
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1136 if (multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1137 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1138 int rest = strlen (s), len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1139
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1140 SET_TEXT_POS (pos, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1141 while (charpos--)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1142 {
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1143 string_char_and_length (s, rest, &len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1144 s += len, rest -= len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1145 xassert (rest >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1146 CHARPOS (pos) += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1147 BYTEPOS (pos) += len;
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1150 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1151 SET_TEXT_POS (pos, charpos, charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1152
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1153 return pos;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1156
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1157 /* Value is the number of characters in C string S. MULTIBYTE_P
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1158 non-zero means recognize multibyte characters. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1159
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1160 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1161 number_of_chars (s, multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1162 unsigned char *s;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1163 int multibyte_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1164 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1165 int nchars;
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 if (multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1168 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1169 int rest = strlen (s), len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1170 unsigned char *p = (unsigned char *) s;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1171
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1172 for (nchars = 0; rest > 0; ++nchars)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1173 {
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1174 string_char_and_length (p, rest, &len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1175 rest -= len, p += len;
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1178 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1179 nchars = strlen (s);
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 return nchars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1182 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1183
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1184
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1185 /* Compute byte position NEWPOS->bytepos corresponding to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1186 NEWPOS->charpos. POS is a known position in string STRING.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1187 NEWPOS->charpos must be >= POS.charpos. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1190 compute_string_pos (newpos, pos, string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1191 struct text_pos *newpos, pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1192 Lisp_Object string;
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 xassert (STRINGP (string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1195 xassert (CHARPOS (*newpos) >= CHARPOS (pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1196
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1197 if (STRING_MULTIBYTE (string))
28464
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
1198 *newpos = string_pos_nchars_ahead (pos, string,
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
1199 CHARPOS (*newpos) - CHARPOS (pos));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1200 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1201 BYTEPOS (*newpos) = CHARPOS (*newpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1202 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1203
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1204
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1205
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 Lisp form evaluation
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1208 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1209
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1210 /* Error handler for safe_eval and safe_call. */
25012
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 static Lisp_Object
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1213 safe_eval_handler (arg)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1214 Lisp_Object arg;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1215 {
33072
176f2eb7a645 (safe_eval_handler): Call add_to_log.
Gerd Moellmann <gerd@gnu.org>
parents: 33068
diff changeset
1216 add_to_log ("Error during redisplay: %s", arg, Qnil);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1217 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1218 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1219
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 /* Evaluate SEXPR and return the result, or nil if something went
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1222 wrong. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1223
30202
bade676e0950 (eval_form): Make it externally visible.
Gerd Moellmann <gerd@gnu.org>
parents: 30159
diff changeset
1224 Lisp_Object
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1225 safe_eval (sexpr)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1226 Lisp_Object sexpr;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1227 {
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
1228 int count = BINDING_STACK_SIZE ();
30216
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1229 struct gcpro gcpro1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1230 Lisp_Object val;
30216
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1231
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1232 GCPRO1 (sexpr);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1233 specbind (Qinhibit_redisplay, Qt);
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1234 val = internal_condition_case_1 (Feval, sexpr, Qerror, safe_eval_handler);
30216
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1235 UNGCPRO;
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1236 return unbind_to (count, val);
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1237 }
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1238
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1239
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1240 /* Call function ARGS[0] with arguments ARGS[1] to ARGS[NARGS - 1].
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1241 Return the result, or nil if something went wrong. */
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1242
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1243 Lisp_Object
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1244 safe_call (nargs, args)
30216
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1245 int nargs;
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1246 Lisp_Object *args;
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1247 {
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
1248 int count = BINDING_STACK_SIZE ();
30216
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1249 Lisp_Object val;
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1250 struct gcpro gcpro1;
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1251
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1252 GCPRO1 (args[0]);
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1253 gcpro1.nvars = nargs;
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1254 specbind (Qinhibit_redisplay, Qt);
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1255 val = internal_condition_case_2 (Ffuncall, nargs, args, Qerror,
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1256 safe_eval_handler);
30216
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1257 UNGCPRO;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1258 return unbind_to (count, val);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1261
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1262 /* Call function FN with one argument ARG.
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1263 Return the result, or nil if something went wrong. */
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1264
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1265 Lisp_Object
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1266 safe_call1 (fn, arg)
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1267 Lisp_Object fn, arg;
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1268 {
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1269 Lisp_Object args[2];
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1270 args[0] = fn;
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1271 args[1] = arg;
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1272 return safe_call (2, args);
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1273 }
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1274
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1275
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1276
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1277 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1278 Debugging
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1279 ***********************************************************************/
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 #if 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1282
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1283 /* Define CHECK_IT to perform sanity checks on iterators.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1284 This is for debugging. It is too slow to do unconditionally. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1285
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1286 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1287 check_it (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1288 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1289 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1290 if (it->method == next_element_from_string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1291 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1292 xassert (STRINGP (it->string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1293 xassert (IT_STRING_CHARPOS (*it) >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1294 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1295 else if (it->method == next_element_from_buffer)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1296 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1297 /* Check that character and byte positions agree. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1298 xassert (IT_CHARPOS (*it) == BYTE_TO_CHAR (IT_BYTEPOS (*it)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1299 }
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 if (it->dpvec)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1302 xassert (it->current.dpvec_index >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1303 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1304 xassert (it->current.dpvec_index < 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1305 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1306
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1307 #define CHECK_IT(IT) check_it ((IT))
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 #else /* not 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1310
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1311 #define CHECK_IT(IT) (void) 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1312
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1313 #endif /* not 0 */
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1316 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1317
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1318 /* 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
1319 to be---the last row in the current matrix displaying text. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1322 check_window_end (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1323 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1324 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1325 if (!MINI_WINDOW_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1326 && !NILP (w->window_end_valid))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1327 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1328 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1329 xassert ((row = MATRIX_ROW (w->current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1330 XFASTINT (w->window_end_vpos)),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1331 !row->enabled_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1332 || MATRIX_ROW_DISPLAYS_TEXT_P (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1333 || MATRIX_ROW_VPOS (row, w->current_matrix) == 0));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1334 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1335 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1336
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1337 #define CHECK_WINDOW_END(W) check_window_end ((W))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1338
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1339 #else /* not GLYPH_DEBUG */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1340
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1341 #define CHECK_WINDOW_END(W) (void) 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1342
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1343 #endif /* not GLYPH_DEBUG */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1344
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1345
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1346
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1347 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1348 Iterator initialization
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1349 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1350
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1351 /* Initialize IT for displaying current_buffer in window W, starting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1352 at character position CHARPOS. CHARPOS < 0 means that no buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1353 position is specified which is useful when the iterator is assigned
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1354 a position later. BYTEPOS is the byte position corresponding to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1355 CHARPOS. BYTEPOS <= 0 means compute it from CHARPOS.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1356
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1357 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
1358 will produce glyphs in that row.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1359
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1360 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
1361 DEFAULT_FACE_ID for normal text, MODE_LINE_FACE_ID or
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1362 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
1363 displaying the tool-bar.
25012
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 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
1366 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
1367 corresponding mode line glyph row of the desired matrix of W. */
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 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1370 init_iterator (it, w, charpos, bytepos, row, base_face_id)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1371 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1372 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1373 int charpos, bytepos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1374 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1375 enum face_id base_face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1376 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1377 int highlight_region_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1378
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1379 /* Some precondition checks. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1380 xassert (w != NULL && it != NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1381 xassert (charpos < 0 || (charpos > 0 && charpos <= ZV));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1382
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1383 /* If face attributes have been changed since the last redisplay,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1384 free realized faces now because they depend on face definitions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1385 that might have changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1386 if (face_change_count)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1387 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1388 face_change_count = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1389 free_all_realized_faces (Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1390 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1391
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1392 /* 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
1393 appropriate. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1394 if (row == NULL)
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 if (base_face_id == MODE_LINE_FACE_ID)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1397 row = MATRIX_MODE_LINE_ROW (w->desired_matrix);
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1398 else if (base_face_id == HEADER_LINE_FACE_ID)
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1399 row = MATRIX_HEADER_LINE_ROW (w->desired_matrix);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1400 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1401
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1402 /* Clear IT. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1403 bzero (it, sizeof *it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1404 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1405 it->current.dpvec_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1406 it->base_face_id = base_face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1407
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1408 /* The window in which we iterate over current_buffer: */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1409 XSETWINDOW (it->window, w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1410 it->w = w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1411 it->f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1412
28692
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
1413 /* Extra space between lines (on window systems only). */
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
1414 if (base_face_id == DEFAULT_FACE_ID
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
1415 && FRAME_WINDOW_P (it->f))
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
1416 {
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
1417 if (NATNUMP (current_buffer->extra_line_spacing))
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
1418 it->extra_line_spacing = XFASTINT (current_buffer->extra_line_spacing);
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
1419 else if (it->f->extra_line_spacing > 0)
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
1420 it->extra_line_spacing = it->f->extra_line_spacing;
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
1421 }
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
1422
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1423 /* If realized faces have been removed, e.g. because of face
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1424 attribute changes of named faces, recompute them. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1425 if (FRAME_FACE_CACHE (it->f)->used == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1426 recompute_basic_faces (it->f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1427
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1428 /* Current value of the `space-width', and 'height' properties. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1429 it->space_width = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1430 it->font_height = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1431
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1432 /* Are control characters displayed as `^C'? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1433 it->ctl_arrow_p = !NILP (current_buffer->ctl_arrow);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1434
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1435 /* -1 means everything between a CR and the following line end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1436 is invisible. >0 means lines indented more than this value are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1437 invisible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1438 it->selective = (INTEGERP (current_buffer->selective_display)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1439 ? XFASTINT (current_buffer->selective_display)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1440 : (!NILP (current_buffer->selective_display)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1441 ? -1 : 0));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1442 it->selective_display_ellipsis_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1443 = !NILP (current_buffer->selective_display_ellipses);
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 /* Display table to use. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1446 it->dp = window_display_table (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1447
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1448 /* Are multibyte characters enabled in current_buffer? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1449 it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1450
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1451 /* Non-zero if we should highlight the region. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1452 highlight_region_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1453 = (!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1454 && !NILP (current_buffer->mark_active)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1455 && XMARKER (current_buffer->mark)->buffer != 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1456
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1457 /* Set IT->region_beg_charpos and IT->region_end_charpos to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1458 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
1459 -1 to indicate no region. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1460 if (highlight_region_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1461 /* Maybe highlight only in selected window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1462 && (/* Either show region everywhere. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1463 highlight_nonselected_windows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1464 /* Or show region in the selected window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1465 || w == XWINDOW (selected_window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1466 /* 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
1467 the window the mini-buffer refers to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1468 || (MINI_WINDOW_P (XWINDOW (selected_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1469 && w == XWINDOW (Vminibuf_scroll_window))))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1470 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1471 int charpos = marker_position (current_buffer->mark);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1472 it->region_beg_charpos = min (PT, charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1473 it->region_end_charpos = max (PT, charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1474 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1475 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1476 it->region_beg_charpos = it->region_end_charpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1477
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1478 /* Get the position at which the redisplay_end_trigger hook should
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1479 be run, if it is to be run at all. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1480 if (MARKERP (w->redisplay_end_trigger)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1481 && XMARKER (w->redisplay_end_trigger)->buffer != 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1482 it->redisplay_end_trigger_charpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1483 = marker_position (w->redisplay_end_trigger);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1484 else if (INTEGERP (w->redisplay_end_trigger))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1485 it->redisplay_end_trigger_charpos = XINT (w->redisplay_end_trigger);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1486
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1487 /* Correct bogus values of tab_width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1488 it->tab_width = XINT (current_buffer->tab_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1489 if (it->tab_width <= 0 || it->tab_width > 1000)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1490 it->tab_width = 8;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1491
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1492 /* Are lines in the display truncated? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1493 it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1494 = (base_face_id != DEFAULT_FACE_ID
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1495 || XINT (it->w->hscroll)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1496 || (truncate_partial_width_windows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1497 && !WINDOW_FULL_WIDTH_P (it->w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1498 || !NILP (current_buffer->truncate_lines));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1499
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1500 /* Get dimensions of truncation and continuation glyphs. These are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1501 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
1502 frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1503 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1504 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1505 if (it->truncate_lines_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1506 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1507 /* We will need the truncation glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1508 xassert (it->glyph_row == NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1509 produce_special_glyphs (it, IT_TRUNCATION);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1510 it->truncation_pixel_width = it->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1511 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1512 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1513 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1514 /* We will need the continuation glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1515 xassert (it->glyph_row == NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1516 produce_special_glyphs (it, IT_CONTINUATION);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1517 it->continuation_pixel_width = it->pixel_width;
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 /* Reset these values to zero becaue the produce_special_glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1521 above has changed them. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1522 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
1523 it->phys_ascent = it->phys_descent = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1524 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1525
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1526 /* Set this after getting the dimensions of truncation and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1527 continuation glyphs, so that we don't produce glyphs when calling
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1528 produce_special_glyphs, above. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1529 it->glyph_row = row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1530 it->area = TEXT_AREA;
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 /* Get the dimensions of the display area. The display area
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1533 consists of the visible window area plus a horizontally scrolled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1534 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
1535 start of this total display area. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1536 if (base_face_id != DEFAULT_FACE_ID)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1537 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1538 /* Mode lines, menu bar in terminal frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1539 it->first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1540 it->last_visible_x = XFASTINT (w->width) * CANON_X_UNIT (it->f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1541 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1542 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1543 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1544 it->first_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1545 = XFASTINT (it->w->hscroll) * CANON_X_UNIT (it->f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1546 it->last_visible_x = (it->first_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1547 + window_box_width (w, TEXT_AREA));
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 /* If we truncate lines, leave room for the truncator glyph(s) at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1550 the right margin. Otherwise, leave room for the continuation
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1551 glyph(s). Truncation and continuation glyphs are not inserted
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1552 for window-based redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1553 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1554 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1555 if (it->truncate_lines_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1556 it->last_visible_x -= it->truncation_pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1557 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1558 it->last_visible_x -= it->continuation_pixel_width;
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
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1561 it->header_line_p = WINDOW_WANTS_HEADER_LINE_P (w);
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1562 it->current_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w) + w->vscroll;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1563 }
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 /* Leave room for a border glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1566 if (!FRAME_WINDOW_P (it->f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1567 && !WINDOW_RIGHTMOST_P (it->w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1568 it->last_visible_x -= 1;
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 it->last_visible_y = window_text_bottom_y (w);
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 /* For mode lines and alike, arrange for the first glyph having a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1573 left box line if the face specifies a box. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1574 if (base_face_id != DEFAULT_FACE_ID)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1575 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1576 struct face *face;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1577
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1578 it->face_id = base_face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1579
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1580 /* If we have a boxed mode line, make the first character appear
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1581 with a left box line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1582 face = FACE_FROM_ID (it->f, base_face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1583 if (face->box != FACE_NO_BOX)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1584 it->start_of_box_run_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1585 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1586
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1587 /* If a buffer position was specified, set the iterator there,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1588 getting overlays and face properties from that position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1589 if (charpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1590 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1591 it->end_charpos = ZV;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1592 it->face_id = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1593 IT_CHARPOS (*it) = charpos;
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 /* Compute byte position if not specified. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1596 if (bytepos <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1597 IT_BYTEPOS (*it) = CHAR_TO_BYTE (charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1598 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1599 IT_BYTEPOS (*it) = bytepos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1600
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1601 /* Compute faces etc. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1602 reseat (it, it->current.pos, 1);
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 CHECK_IT (it);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1608
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1609 /* Initialize IT for the display of window W with window start POS. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1610
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1611 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1612 start_display (it, w, pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1613 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1614 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1615 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1616 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1617 int start_at_line_beg_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1618 struct glyph_row *row;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1619 int first_vpos = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1620 int first_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1621
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1622 row = w->desired_matrix->rows + first_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1623 init_iterator (it, w, CHARPOS (pos), BYTEPOS (pos), row, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1624 first_y = it->current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1625
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1626 /* 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
1627 start. This makes sure that we take continuation lines into
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1628 account. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1629 start_at_line_beg_p = (CHARPOS (pos) == BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1630 || FETCH_BYTE (BYTEPOS (pos) - 1) == '\n');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1631 if (!start_at_line_beg_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1632 reseat_at_previous_visible_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1633
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1634 /* 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
1635 get the correct continuation_lines_width and current_x. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1636 if (!start_at_line_beg_p)
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 move_it_to (it, CHARPOS (pos), -1, -1, -1, MOVE_TO_POS);
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 /* 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
1641 multi-glyph character (e.g. a control character displayed as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1642 \003, or in the middle of an overlay string). In this case
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1643 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
1644 the continuation line but to the end of the continued line. */
30652
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1645 if (!it->truncate_lines_p)
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1646 {
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1647 if (it->current_x > 0)
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1648 {
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1649 if (it->current.dpvec_index >= 0
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1650 || it->current.overlay_string_index >= 0)
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1651 {
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
1652 set_iterator_to_next (it, 1);
30652
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1653 move_it_in_display_line_to (it, -1, -1, 0);
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1654 }
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1655
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1656 it->continuation_lines_width += it->current_x;
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1657 }
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1658
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1659 /* We're starting a new display line, not affected by the
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1660 height of the continued line, so clear the appropriate
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1661 fields in the iterator structure. */
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1662 it->max_ascent = it->max_descent = 0;
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1663 it->max_phys_ascent = it->max_phys_descent = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1664 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1665
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1666 it->current_y = first_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1667 it->vpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1668 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1669 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1670
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1671 #if 0 /* Don't assert the following because start_display is sometimes
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1672 called intentionally with a window start that is not at a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1673 line start. Please leave this code in as a comment. */
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 /* Window start should be on a line start, now. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1676 xassert (it->continuation_lines_width
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1677 || IT_CHARPOS (it) == BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1678 || FETCH_BYTE (IT_BYTEPOS (it) - 1) == '\n');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1679 #endif /* 0 */
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1682
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1683 /* Initialize IT for stepping through current_buffer in window W,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1684 starting at position POS that includes overlay string and display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1685 vector/ control character translation position information. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1686
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1687 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1688 init_from_display_pos (it, w, pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1689 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1690 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1691 struct display_pos *pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1692 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1693 /* Keep in mind: the call to reseat in init_iterator skips invisible
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1694 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
1695 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
1696 overlay starts there with an after-string, and the overlay has an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1697 invisible property. Since we don't skip invisible text in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1698 display_line and elsewhere immediately after consuming the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1699 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
1700 but the call to init_iterator below will move us to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1701 after-string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1702 init_iterator (it, w, CHARPOS (pos->pos), BYTEPOS (pos->pos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1703 NULL, DEFAULT_FACE_ID);
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 position is within an overlay string, set up IT to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1706 the right overlay string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1707 if (pos->overlay_string_index >= 0)
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 int relative_index;
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 /* We already have the first chunk of overlay strings in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1712 IT->overlay_strings. Load more until the one for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1713 pos->overlay_string_index is in IT->overlay_strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1714 if (pos->overlay_string_index >= OVERLAY_STRING_CHUNK_SIZE)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1715 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1716 int n = pos->overlay_string_index / OVERLAY_STRING_CHUNK_SIZE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1717 it->current.overlay_string_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1718 while (n--)
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 load_overlay_strings (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1721 it->current.overlay_string_index += OVERLAY_STRING_CHUNK_SIZE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1722 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1723 }
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 it->current.overlay_string_index = pos->overlay_string_index;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1726 relative_index = (it->current.overlay_string_index
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1727 % OVERLAY_STRING_CHUNK_SIZE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1728 it->string = it->overlay_strings[relative_index];
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
1729 xassert (STRINGP (it->string));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1730 it->current.string_pos = pos->string_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1731 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1732 }
33863
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1733 else if (it->current.overlay_string_index >= 0)
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1734 {
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1735 /* If POS says we're already after an overlay string ending at
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1736 POS, make sure to pop the iterator because it will be in
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1737 front of that overlay string. When POS is ZV, we've thereby
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1738 also ``processed'' overlay strings at ZV. */
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1739 pop_it (it);
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1740 it->current.overlay_string_index = -1;
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1741 it->method = next_element_from_buffer;
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1742 if (CHARPOS (pos->pos) == ZV)
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1743 it->overlay_strings_at_end_processed_p = 1;
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1744 }
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1745
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1746 if (CHARPOS (pos->string_pos) >= 0)
25012
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 /* Recorded position is not in an overlay string, but in another
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1749 string. This can only be a string from a `display' property.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1750 IT should already be filled with that string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1751 it->current.string_pos = pos->string_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1752 xassert (STRINGP (it->string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1753 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1754
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1755 /* Restore position in display vector translations or control
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1756 character translations. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1757 if (pos->dpvec_index >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1758 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1759 /* This fills IT->dpvec. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1760 get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1761 xassert (it->dpvec && it->current.dpvec_index == 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1762 it->current.dpvec_index = pos->dpvec_index;
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 CHECK_IT (it);
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 /* Initialize IT for stepping through current_buffer in window W
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1770 starting at ROW->start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1771
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1772 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1773 init_to_row_start (it, w, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1774 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1775 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1776 struct glyph_row *row;
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 init_from_display_pos (it, w, &row->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1779 it->continuation_lines_width = row->continuation_lines_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1780 CHECK_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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1783
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1784 /* Initialize IT for stepping through current_buffer in window W
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1785 starting in the line following ROW, i.e. starting at ROW->end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1786
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1787 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1788 init_to_row_end (it, w, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1789 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1790 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1791 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1792 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1793 init_from_display_pos (it, w, &row->end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1794
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1795 if (row->continued_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1796 it->continuation_lines_width = (row->continuation_lines_width
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1797 + row->pixel_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1798 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1799 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1800
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1801
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1802
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1803
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 Text properties
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1806 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1807
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1808 /* Called when IT reaches IT->stop_charpos. Handle text property and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1809 overlay changes. Set IT->stop_charpos to the next position where
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1810 to stop. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1813 handle_stop (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1814 struct it *it;
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 enum prop_handled handled;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1817 int handle_overlay_change_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1818 struct props *p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1819
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1820 it->dpvec = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1821 it->current.dpvec_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1822
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1823 do
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 handled = HANDLED_NORMALLY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1826
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1827 /* Call text property handlers. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1828 for (p = it_props; p->handler; ++p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1829 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1830 handled = p->handler (it);
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
1831
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1832 if (handled == HANDLED_RECOMPUTE_PROPS)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1833 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1834 else if (handled == HANDLED_RETURN)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1835 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1836 else if (handled == HANDLED_OVERLAY_STRING_CONSUMED)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1837 handle_overlay_change_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1838 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1839
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1840 if (handled != HANDLED_RECOMPUTE_PROPS)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1841 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1842 /* Don't check for overlay strings below when set to deliver
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1843 characters from a display vector. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1844 if (it->method == next_element_from_display_vector)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1845 handle_overlay_change_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1846
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1847 /* Handle overlay changes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1848 if (handle_overlay_change_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1849 handled = handle_overlay_change (it);
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 /* Determine where to stop next. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1852 if (handled == HANDLED_NORMALLY)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1853 compute_stop_pos (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1854 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1855 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1856 while (handled == HANDLED_RECOMPUTE_PROPS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1857 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1858
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1859
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1860 /* Compute IT->stop_charpos from text property and overlay change
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1861 information for IT's current position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1862
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1863 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1864 compute_stop_pos (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1865 struct it *it;
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 register INTERVAL iv, next_iv;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1868 Lisp_Object object, limit, position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1869
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1870 /* If nowhere else, stop at the end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1871 it->stop_charpos = it->end_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1872
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1873 if (STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1874 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1875 /* Strings are usually short, so don't limit the search for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1876 properties. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1877 object = it->string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1878 limit = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1879 XSETFASTINT (position, IT_STRING_CHARPOS (*it));
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1882 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1883 int charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1884
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1885 /* If next overlay change is in front of the current stop pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1886 (which is IT->end_charpos), stop there. Note: value of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1887 next_overlay_change is point-max if no overlay change
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1888 follows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1889 charpos = next_overlay_change (IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1890 if (charpos < it->stop_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1891 it->stop_charpos = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1892
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1893 /* If showing the region, we have to stop at the region
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1894 start or end because the face might change there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1895 if (it->region_beg_charpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1896 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1897 if (IT_CHARPOS (*it) < it->region_beg_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1898 it->stop_charpos = min (it->stop_charpos, it->region_beg_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1899 else if (IT_CHARPOS (*it) < it->region_end_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1900 it->stop_charpos = min (it->stop_charpos, it->region_end_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1901 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1902
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1903 /* Set up variables for computing the stop position from text
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1904 property changes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1905 XSETBUFFER (object, current_buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1906 XSETFASTINT (limit, IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1907 XSETFASTINT (position, IT_CHARPOS (*it));
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1911 /* Get the interval containing IT's position. Value is a null
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1912 interval if there isn't such an interval. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1913 iv = validate_interval_range (object, &position, &position, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1914 if (!NULL_INTERVAL_P (iv))
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 Lisp_Object values_here[LAST_PROP_IDX];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1917 struct props *p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1918
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1919 /* Get properties here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1920 for (p = it_props; p->handler; ++p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1921 values_here[p->idx] = textget (iv->plist, *p->name);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1922
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1923 /* Look for an interval following iv that has different
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1924 properties. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1925 for (next_iv = next_interval (iv);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1926 (!NULL_INTERVAL_P (next_iv)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1927 && (NILP (limit)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1928 || XFASTINT (limit) > next_iv->position));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1929 next_iv = next_interval (next_iv))
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 for (p = it_props; p->handler; ++p)
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 Lisp_Object new_value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1934
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1935 new_value = textget (next_iv->plist, *p->name);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1936 if (!EQ (values_here[p->idx], new_value))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1937 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1938 }
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 if (p->handler)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1941 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1942 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1943
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1944 if (!NULL_INTERVAL_P (next_iv))
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 if (INTEGERP (limit)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1947 && next_iv->position >= XFASTINT (limit))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1948 /* No text property change up to limit. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1949 it->stop_charpos = min (XFASTINT (limit), it->stop_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1950 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1951 /* Text properties change in next_iv. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1952 it->stop_charpos = min (it->stop_charpos, next_iv->position);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1953 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1954 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1955
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1956 xassert (STRINGP (it->string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1957 || (it->stop_charpos >= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1958 && it->stop_charpos >= IT_CHARPOS (*it)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1959 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1960
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1961
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1962 /* Return the position of the next overlay change after POS in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1963 current_buffer. Value is point-max if no overlay change
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1964 follows. This is like `next-overlay-change' but doesn't use
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1965 xmalloc. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1966
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1967 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1968 next_overlay_change (pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1969 int pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1970 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1971 int noverlays;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1972 int endpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1973 Lisp_Object *overlays;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1974 int len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1975 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1976
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1977 /* Get all overlays at the given position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1978 len = 10;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1979 overlays = (Lisp_Object *) alloca (len * sizeof *overlays);
30697
0b56d5da235e (next_overlay_change): Update call to overlays_at.
Miles Bader <miles@gnu.org>
parents: 30675
diff changeset
1980 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1981 if (noverlays > len)
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 len = noverlays;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1984 overlays = (Lisp_Object *) alloca (len * sizeof *overlays);
30697
0b56d5da235e (next_overlay_change): Update call to overlays_at.
Miles Bader <miles@gnu.org>
parents: 30675
diff changeset
1985 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1986 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1987
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1988 /* If any of these overlays ends before endpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1989 use its ending point instead. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1990 for (i = 0; i < noverlays; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1991 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1992 Lisp_Object oend;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1993 int oendpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1994
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1995 oend = OVERLAY_END (overlays[i]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1996 oendpos = OVERLAY_POSITION (oend);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1997 endpos = min (endpos, oendpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1998 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1999
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2000 return endpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2001 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2002
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2003
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 Fontification
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2007 ***********************************************************************/
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 /* Handle changes in the `fontified' property of the current buffer by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2010 calling hook functions from Qfontification_functions to fontify
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2011 regions of text. */
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 static enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2014 handle_fontified_prop (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2015 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2016 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2017 Lisp_Object prop, pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2018 enum prop_handled handled = HANDLED_NORMALLY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2019
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2020 /* Get the value of the `fontified' property at IT's current buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2021 position. (The `fontified' property doesn't have a special
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2022 meaning in strings.) If the value is nil, call functions from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2023 Qfontification_functions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2024 if (!STRINGP (it->string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2025 && it->s == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2026 && !NILP (Vfontification_functions)
31610
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2027 && !NILP (Vrun_hooks)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2028 && (pos = make_number (IT_CHARPOS (*it)),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2029 prop = Fget_char_property (pos, Qfontified, Qnil),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2030 NILP (prop)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2031 {
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
2032 int count = BINDING_STACK_SIZE ();
31610
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2033 Lisp_Object val;
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2034
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2035 val = Vfontification_functions;
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2036 specbind (Qfontification_functions, Qnil);
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2037 specbind (Qafter_change_functions, Qnil);
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2038
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2039 if (!CONSP (val) || EQ (XCAR (val), Qlambda))
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
2040 safe_call1 (val, pos);
31610
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2041 else
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2042 {
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2043 Lisp_Object globals, fn;
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2044 struct gcpro gcpro1, gcpro2;
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2045
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2046 globals = Qnil;
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2047 GCPRO2 (val, globals);
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2048
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2049 for (; CONSP (val); val = XCDR (val))
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2050 {
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2051 fn = XCAR (val);
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2052
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2053 if (EQ (fn, Qt))
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2054 {
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2055 /* A value of t indicates this hook has a local
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2056 binding; it means to run the global binding too.
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2057 In a global value, t should not occur. If it
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2058 does, we must ignore it to avoid an endless
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2059 loop. */
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2060 for (globals = Fdefault_value (Qfontification_functions);
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2061 CONSP (globals);
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2062 globals = XCDR (globals))
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2063 {
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2064 fn = XCAR (globals);
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2065 if (!EQ (fn, Qt))
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
2066 safe_call1 (fn, pos);
31610
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2067 }
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2068 }
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2069 else
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
2070 safe_call1 (fn, pos);
31610
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2071 }
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2072
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2073 UNGCPRO;
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2074 }
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2075
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2076 unbind_to (count, Qnil);
25012
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 /* Return HANDLED_RECOMPUTE_PROPS only if function fontified
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2079 something. This avoids an endless loop if they failed to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2080 fontify the text for which reason ever. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2081 if (!NILP (Fget_char_property (pos, Qfontified, Qnil)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2082 handled = HANDLED_RECOMPUTE_PROPS;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2083 }
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 return handled;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2086 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2087
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2090 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2091 Faces
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2092 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2093
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2094 /* Set up iterator IT from face properties at its current position.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2095 Called from handle_stop. */
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 static enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2098 handle_face_prop (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2099 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2100 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2101 int new_face_id, next_stop;
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 if (!STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2104 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2105 new_face_id
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2106 = face_at_buffer_position (it->w,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2107 IT_CHARPOS (*it),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2108 it->region_beg_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2109 it->region_end_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2110 &next_stop,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2111 (IT_CHARPOS (*it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2112 + TEXT_PROP_DISTANCE_LIMIT),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2113 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2114
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2115 /* Is this a start of a run of characters with box face?
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2116 Caveat: this can be called for a freshly initialized
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2117 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
2118 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
2119 box, all characters up to limit will have one. But, as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2120 usual, we don't know whether limit is really the end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2121 if (new_face_id != it->face_id)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2122 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2123 struct face *new_face = FACE_FROM_ID (it->f, new_face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2124
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2125 /* 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
2126 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
2127 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
2128 iterator will be -1 if this is the initial call that gets
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2129 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
2130 position and see whether there is a face != new_face_id. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2131 it->start_of_box_run_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2132 = (new_face->box != FACE_NO_BOX
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2133 && (it->face_id >= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2134 || IT_CHARPOS (*it) == BEG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2135 || new_face_id != face_before_it_pos (it)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2136 it->face_box_p = new_face->box != FACE_NO_BOX;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2137 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2138 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2139 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2140 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2141 new_face_id
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2142 = face_at_string_position (it->w,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2143 it->string,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2144 IT_STRING_CHARPOS (*it),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2145 (it->current.overlay_string_index >= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2146 ? IT_CHARPOS (*it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2147 : 0),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2148 it->region_beg_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2149 it->region_end_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2150 &next_stop,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2151 it->base_face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2152
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2153 #if 0 /* This shouldn't be neccessary. Let's check it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2154 /* 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
2155 use the mode line face instead of the frame's default face. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2156 if (it->glyph_row == MATRIX_MODE_LINE_ROW (it->w->desired_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2157 && new_face_id == DEFAULT_FACE_ID)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2158 new_face_id = MODE_LINE_FACE_ID;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2159 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2160
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2161 /* Is this a start of a run of characters with box? Caveat:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2162 this can be called for a freshly allocated iterator; face_id
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2163 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
2164 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
2165 box, all characters up to that position will have a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2166 box. But, as usual, we don't know whether that position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2167 is really the end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2168 if (new_face_id != it->face_id)
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 struct face *new_face = FACE_FROM_ID (it->f, new_face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2171 struct face *old_face = FACE_FROM_ID (it->f, it->face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2172
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2173 /* 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
2174 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
2175 shadow on the left side. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2176 it->start_of_box_run_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2177 = new_face->box && (old_face == NULL || !old_face->box);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2178 it->face_box_p = new_face->box != FACE_NO_BOX;
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2181
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2182 it->face_id = new_face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2183 return HANDLED_NORMALLY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2184 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2185
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2186
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2187 /* Compute the face one character before or after the current position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2188 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
2189 position. Value is the id of the face. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2190
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2191 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2192 face_before_or_after_it_pos (it, before_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2193 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2194 int before_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2195 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2196 int face_id, limit;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2197 int next_check_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2198 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2199
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2200 xassert (it->s == NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2201
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2202 if (STRINGP (it->string))
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 /* No face change past the end of the string (for the case
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2205 we are padding with spaces). No face change before the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2206 string start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2207 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2208 || (IT_STRING_CHARPOS (*it) == 0 && before_p))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2209 return it->face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2210
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2211 /* Set pos to the position before or after IT's current position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2212 if (before_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2213 pos = string_pos (IT_STRING_CHARPOS (*it) - 1, it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2214 else
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2215 /* For composition, we must check the character after the
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2216 composition. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2217 pos = (it->what == IT_COMPOSITION
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2218 ? string_pos (IT_STRING_CHARPOS (*it) + it->cmp_len, it->string)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2219 : string_pos (IT_STRING_CHARPOS (*it) + 1, it->string));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2220
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2221 /* Get the face for ASCII, or unibyte. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2222 face_id
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2223 = face_at_string_position (it->w,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2224 it->string,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2225 CHARPOS (pos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2226 (it->current.overlay_string_index >= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2227 ? IT_CHARPOS (*it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2228 : 0),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2229 it->region_beg_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2230 it->region_end_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2231 &next_check_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2232 it->base_face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2233
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2234 /* Correct the face for charsets different from ASCII. Do it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2235 for the multibyte case only. The face returned above is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2236 suitable for unibyte text if IT->string is unibyte. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2237 if (STRING_MULTIBYTE (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2238 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2239 unsigned char *p = XSTRING (it->string)->data + BYTEPOS (pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2240 int rest = STRING_BYTES (XSTRING (it->string)) - BYTEPOS (pos);
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
2241 int c, len;
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
2242 struct face *face = FACE_FROM_ID (it->f, face_id);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2243
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
2244 c = string_char_and_length (p, rest, &len);
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
2245 face_id = FACE_FOR_CHAR (it->f, face, c);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2246 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2247 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2248 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2249 {
25242
28067247ff90 (face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents: 25197
diff changeset
2250 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
2251 || (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
2252 return it->face_id;
28067247ff90 (face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents: 25197
diff changeset
2253
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2254 limit = IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2255 pos = it->current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2256
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2257 if (before_p)
28362
a568b23317fe (face_before_or_after_it_pos): Pass multibyteness
Gerd Moellmann <gerd@gnu.org>
parents: 28228
diff changeset
2258 DEC_TEXT_POS (pos, it->multibyte_p);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2259 else
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2260 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2261 if (it->what == IT_COMPOSITION)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2262 /* For composition, we must check the position after the
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2263 composition. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2264 pos.charpos += it->cmp_len, pos.bytepos += it->len;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2265 else
28362
a568b23317fe (face_before_or_after_it_pos): Pass multibyteness
Gerd Moellmann <gerd@gnu.org>
parents: 28228
diff changeset
2266 INC_TEXT_POS (pos, it->multibyte_p);
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2267 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2268 /* Determine face for CHARSET_ASCII, or unibyte. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2269 face_id = face_at_buffer_position (it->w,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2270 CHARPOS (pos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2271 it->region_beg_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2272 it->region_end_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2273 &next_check_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2274 limit, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2275
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2276 /* Correct the face for charsets different from ASCII. Do it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2277 for the multibyte case only. The face returned above is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2278 suitable for unibyte text if current_buffer is unibyte. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2279 if (it->multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2280 {
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
2281 int c = FETCH_MULTIBYTE_CHAR (CHARPOS (pos));
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
2282 struct face *face = FACE_FROM_ID (it->f, face_id);
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
2283 face_id = FACE_FOR_CHAR (it->f, face, c);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2284 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2287 return face_id;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2290
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2291
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2292 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2293 Invisible text
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2294 ***********************************************************************/
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 /* Set up iterator IT from invisible properties at its current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2297 position. Called from handle_stop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2298
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2299 static enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2300 handle_invisible_prop (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2301 struct it *it;
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 enum prop_handled handled = HANDLED_NORMALLY;
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 if (STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2306 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2307 extern Lisp_Object Qinvisible;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2308 Lisp_Object prop, end_charpos, limit, charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2309
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2310 /* Get the value of the invisible text property at the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2311 current position. Value will be nil if there is no such
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2312 property. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2313 XSETFASTINT (charpos, IT_STRING_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2314 prop = Fget_text_property (charpos, Qinvisible, it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2315
29191
3977c8167022 (handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents: 29185
diff changeset
2316 if (!NILP (prop)
3977c8167022 (handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents: 29185
diff changeset
2317 && IT_STRING_CHARPOS (*it) < it->end_charpos)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2318 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2319 handled = HANDLED_RECOMPUTE_PROPS;
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 /* Get the position at which the next change of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2322 invisible text property can be found in IT->string.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2323 Value will be nil if the property value is the same for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2324 all the rest of IT->string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2325 XSETINT (limit, XSTRING (it->string)->size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2326 end_charpos = Fnext_single_property_change (charpos, Qinvisible,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2327 it->string, limit);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2328
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2329 /* Text at current position is invisible. The next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2330 change in the property is at position end_charpos.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2331 Move IT's current position to that position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2332 if (INTEGERP (end_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2333 && XFASTINT (end_charpos) < XFASTINT (limit))
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 text_pos old;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2336 old = it->current.string_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2337 IT_STRING_CHARPOS (*it) = XFASTINT (end_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2338 compute_string_pos (&it->current.string_pos, old, it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2339 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2340 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2341 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2342 /* The rest of the string is invisible. If this is an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2343 overlay string, proceed with the next overlay string
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2344 or whatever comes and return a character from there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2345 if (it->current.overlay_string_index >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2346 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2347 next_overlay_string (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2348 /* Don't check for overlay strings when we just
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2349 finished processing them. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2350 handled = HANDLED_OVERLAY_STRING_CONSUMED;
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2353 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2354 struct Lisp_String *s = XSTRING (it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2355 IT_STRING_CHARPOS (*it) = s->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2356 IT_STRING_BYTEPOS (*it) = STRING_BYTES (s);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2357 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2358 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2359 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2360 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2361 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2362 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2363 int visible_p, newpos, next_stop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2364 Lisp_Object pos, prop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2365
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2366 /* First of all, is there invisible text at this position? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2367 XSETFASTINT (pos, IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2368 prop = Fget_char_property (pos, Qinvisible, it->window);
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 /* If we are on invisible text, skip over it. */
29191
3977c8167022 (handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents: 29185
diff changeset
2371 if (TEXT_PROP_MEANS_INVISIBLE (prop)
3977c8167022 (handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents: 29185
diff changeset
2372 && IT_CHARPOS (*it) < it->end_charpos)
25012
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 /* Record whether we have to display an ellipsis for the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2375 invisible text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2376 int display_ellipsis_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2377 = TEXT_PROP_MEANS_INVISIBLE_WITH_ELLIPSIS (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2378
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2379 handled = HANDLED_RECOMPUTE_PROPS;
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 /* Loop skipping over invisible text. The loop is left at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2382 ZV or with IT on the first char being visible again. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2383 do
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 /* Try to skip some invisible text. Return value is the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2386 position reached which can be equal to IT's position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2387 if there is nothing invisible here. This skips both
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2388 over invisible text properties and overlays with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2389 invisible property. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2390 newpos = skip_invisible (IT_CHARPOS (*it),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2391 &next_stop, ZV, it->window);
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 /* If we skipped nothing at all we weren't at invisible
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2394 text in the first place. If everything to the end of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2395 the buffer was skipped, end the loop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2396 if (newpos == IT_CHARPOS (*it) || newpos >= ZV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2397 visible_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2398 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2399 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2400 /* We skipped some characters but not necessarily
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2401 all there are. Check if we ended up on visible
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2402 text. Fget_char_property returns the property of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2403 the char before the given position, i.e. if we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2404 get visible_p = 1, this means that the char at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2405 newpos is visible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2406 XSETFASTINT (pos, newpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2407 prop = Fget_char_property (pos, Qinvisible, it->window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2408 visible_p = !TEXT_PROP_MEANS_INVISIBLE (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2409 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2410
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2411 /* If we ended up on invisible text, proceed to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2412 skip starting with next_stop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2413 if (!visible_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2414 IT_CHARPOS (*it) = next_stop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2415 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2416 while (!visible_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2417
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2418 /* The position newpos is now either ZV or on visible text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2419 IT_CHARPOS (*it) = newpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2420 IT_BYTEPOS (*it) = CHAR_TO_BYTE (newpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2421
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2422 /* Maybe return `...' next for the end of the invisible text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2423 if (display_ellipsis_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2424 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2425 if (it->dp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2426 && VECTORP (DISP_INVIS_VECTOR (it->dp)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2427 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2428 struct Lisp_Vector *v = XVECTOR (DISP_INVIS_VECTOR (it->dp));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2429 it->dpvec = v->contents;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2430 it->dpend = v->contents + v->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2431 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2432 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2433 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2434 /* Default `...'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2435 it->dpvec = default_invis_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2436 it->dpend = default_invis_vector + 3;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2437 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2438
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2439 /* The ellipsis display does not replace the display of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2440 the character at the new position. Indicate this by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2441 setting IT->dpvec_char_len to zero. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2442 it->dpvec_char_len = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2443
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2444 it->current.dpvec_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2445 it->method = next_element_from_display_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2446 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2447 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2448 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2449
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2450 return handled;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2451 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2452
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2453
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2454
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2455 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2456 'display' property
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2457 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2458
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2459 /* Set up iterator IT from `display' property at its current position.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2460 Called from handle_stop. */
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 static enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2463 handle_display_prop (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2464 struct it *it;
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 Lisp_Object prop, object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2467 struct text_pos *position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2468 int space_or_image_found_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2469
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2470 if (STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2471 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2472 object = it->string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2473 position = &it->current.string_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2474 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2475 else
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 object = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2478 position = &it->current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2479 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2480
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2481 /* Reset those iterator values set from display property values. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2482 it->font_height = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2483 it->space_width = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2484 it->voffset = 0;
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 /* We don't support recursive `display' properties, i.e. string
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2487 values that have a string `display' property, that have a string
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2488 `display' property etc. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2489 if (!it->string_from_display_prop_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2490 it->area = TEXT_AREA;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2491
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2492 prop = Fget_char_property (make_number (position->charpos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2493 Qdisplay, object);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2494 if (NILP (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2495 return HANDLED_NORMALLY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2496
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2497 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
2498 if (CONSP (prop)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2499 && CONSP (XCAR (prop))
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2500 && !EQ (Qmargin, XCAR (XCAR (prop))))
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2501 {
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2502 /* A list of sub-properties. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2503 while (CONSP (prop))
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 if (handle_single_display_prop (it, XCAR (prop), object, position))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2506 space_or_image_found_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2507 prop = XCDR (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2508 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2509 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2510 else if (VECTORP (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2511 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2512 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2513 for (i = 0; i < XVECTOR (prop)->size; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2514 if (handle_single_display_prop (it, XVECTOR (prop)->contents[i],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2515 object, position))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2516 space_or_image_found_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2517 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2518 else
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 if (handle_single_display_prop (it, prop, object, position))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2521 space_or_image_found_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2522 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2523
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2524 return space_or_image_found_p ? HANDLED_RETURN : HANDLED_NORMALLY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2525 }
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
25820
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2528 /* 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
2529 at START_POS in OBJECT. */
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 static struct text_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2532 display_prop_end (it, object, start_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2533 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2534 Lisp_Object object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2535 struct text_pos start_pos;
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 Lisp_Object end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2538 struct text_pos end_pos;
25820
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2539
30243
c56062542bae (display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents: 30216
diff changeset
2540 end = Fnext_single_char_property_change (make_number (CHARPOS (start_pos)),
c56062542bae (display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents: 30216
diff changeset
2541 Qdisplay, object, Qnil);
25820
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2542 CHARPOS (end_pos) = XFASTINT (end);
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2543 if (STRINGP (object))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2544 compute_string_pos (&end_pos, start_pos, it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2545 else
25820
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2546 BYTEPOS (end_pos) = CHAR_TO_BYTE (XFASTINT (end));
25012
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 return end_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2549 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2550
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 /* Set up IT from a single `display' sub-property value PROP. OBJECT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2553 is the object in which the `display' property was found. *POSITION
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2554 is the position at which it was found.
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 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
2557 end position of the `display' property.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2558
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2559 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
2560
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2561 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2562 handle_single_display_prop (it, prop, object, position)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2563 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2564 Lisp_Object prop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2565 Lisp_Object object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2566 struct text_pos *position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2567 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2568 Lisp_Object value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2569 int space_or_image_found_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2570 Lisp_Object form;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2571
25614
766b6a577f15 (Qwhen): Replaces QCwhen.
Gerd Moellmann <gerd@gnu.org>
parents: 25598
diff changeset
2572 /* 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
2573 evaluated. If the result is nil, VALUE is ignored. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2574 form = Qt;
25614
766b6a577f15 (Qwhen): Replaces QCwhen.
Gerd Moellmann <gerd@gnu.org>
parents: 25598
diff changeset
2575 if (CONSP (prop) && EQ (XCAR (prop), Qwhen))
25012
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 prop = XCDR (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2578 if (!CONSP (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2579 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2580 form = XCAR (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2581 prop = XCDR (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2582 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2583
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2584 if (!NILP (form) && !EQ (form, Qt))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2585 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2586 struct gcpro gcpro1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2587 struct text_pos end_pos, pt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2588
28869
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2589 GCPRO1 (form);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2590 end_pos = display_prop_end (it, object, *position);
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 /* Temporarily set point to the end position, and then evaluate
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2593 the form. This makes `(eolp)' work as FORM. */
28869
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2594 if (BUFFERP (object))
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2595 {
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2596 CHARPOS (pt) = PT;
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2597 BYTEPOS (pt) = PT_BYTE;
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2598 TEMP_SET_PT_BOTH (CHARPOS (end_pos), BYTEPOS (end_pos));
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2599 }
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2600
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
2601 form = safe_eval (form);
28869
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2602
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2603 if (BUFFERP (object))
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2604 TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2605 UNGCPRO;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2606 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2607
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2608 if (NILP (form))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2609 return 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 if (CONSP (prop)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2612 && EQ (XCAR (prop), Qheight)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2613 && CONSP (XCDR (prop)))
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 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2616 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2617
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2618 /* `(height HEIGHT)'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2619 it->font_height = XCAR (XCDR (prop));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2620 if (!NILP (it->font_height))
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 struct face *face = FACE_FROM_ID (it->f, it->face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2623 int new_height = -1;
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 if (CONSP (it->font_height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2626 && (EQ (XCAR (it->font_height), Qplus)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2627 || EQ (XCAR (it->font_height), Qminus))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2628 && CONSP (XCDR (it->font_height))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2629 && INTEGERP (XCAR (XCDR (it->font_height))))
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 /* `(+ N)' or `(- N)' where N is an integer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2632 int steps = XINT (XCAR (XCDR (it->font_height)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2633 if (EQ (XCAR (it->font_height), Qplus))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2634 steps = - steps;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2635 it->face_id = smaller_face (it->f, it->face_id, steps);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2636 }
30216
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
2637 else if (FUNCTIONP (it->font_height))
25012
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 /* Call function with current height as argument.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2640 Value is the new height. */
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
2641 Lisp_Object height;
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
2642 height = safe_call1 (it->font_height,
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
2643 face->lface[LFACE_HEIGHT_INDEX]);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2644 if (NUMBERP (height))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2645 new_height = XFLOATINT (height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2646 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2647 else if (NUMBERP (it->font_height))
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 /* Value is a multiple of the canonical char height. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2650 struct face *face;
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 face = FACE_FROM_ID (it->f, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2653 new_height = (XFLOATINT (it->font_height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2654 * XINT (face->lface[LFACE_HEIGHT_INDEX]));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2655 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2656 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2657 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2658 /* Evaluate IT->font_height with `height' bound to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2659 current specified height to get the new height. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2660 Lisp_Object value;
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
2661 int count = BINDING_STACK_SIZE ();
25012
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 specbind (Qheight, face->lface[LFACE_HEIGHT_INDEX]);
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
2664 value = safe_eval (it->font_height);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2665 unbind_to (count, Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2666
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2667 if (NUMBERP (value))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2668 new_height = XFLOATINT (value);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2669 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2670
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2671 if (new_height > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2672 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
2673 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2674 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2675 else if (CONSP (prop)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2676 && EQ (XCAR (prop), Qspace_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2677 && CONSP (XCDR (prop)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2678 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2679 /* `(space_width WIDTH)'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2680 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2681 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2682
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2683 value = XCAR (XCDR (prop));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2684 if (NUMBERP (value) && XFLOATINT (value) > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2685 it->space_width = value;
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 else if (CONSP (prop)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2688 && EQ (XCAR (prop), Qraise)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2689 && CONSP (XCDR (prop)))
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 /* `(raise FACTOR)'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2692 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2693 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2694
27118
2efb49dc860b (handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
Eli Zaretskii <eliz@gnu.org>
parents: 27106
diff changeset
2695 #ifdef HAVE_WINDOW_SYSTEM
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2696 value = XCAR (XCDR (prop));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2697 if (NUMBERP (value))
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 struct face *face = FACE_FROM_ID (it->f, it->face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2700 it->voffset = - (XFLOATINT (value)
27897
a6384a2b5574 (handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents: 27843
diff changeset
2701 * (FONT_HEIGHT (face->font)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2702 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2703 #endif /* HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2704 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2705 else if (!it->string_from_display_prop_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2706 {
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2707 /* `((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
2708 VALUE) or `((margin nil) VALUE)' or VALUE. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2709 Lisp_Object location, value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2710 struct text_pos start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2711 int valid_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2712
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2713 /* Characters having this form of property are not displayed, so
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2714 we have to find the end of the property. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2715 start_pos = *position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2716 *position = display_prop_end (it, object, start_pos);
28206
07ac059dece0 (handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents: 28047
diff changeset
2717 value = Qnil;
25012
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 /* Let's stop at the new position and assume that all
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2720 text properties change there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2721 it->stop_charpos = position->charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2722
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2723 location = Qunbound;
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2724 if (CONSP (prop) && CONSP (XCAR (prop)))
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2725 {
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2726 Lisp_Object tem;
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2727
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2728 value = XCDR (prop);
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2729 if (CONSP (value))
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2730 value = XCAR (value);
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2731
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2732 tem = XCAR (prop);
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2733 if (EQ (XCAR (tem), Qmargin)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2734 && (tem = XCDR (tem),
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2735 tem = CONSP (tem) ? XCAR (tem) : Qnil,
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2736 (NILP (tem)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2737 || EQ (tem, Qleft_margin)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2738 || EQ (tem, Qright_margin))))
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2739 location = tem;
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2740 }
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2741
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2742 if (EQ (location, Qunbound))
25012
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 location = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2745 value = prop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2746 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2747
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2748 #ifdef HAVE_WINDOW_SYSTEM
27118
2efb49dc860b (handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
Eli Zaretskii <eliz@gnu.org>
parents: 27106
diff changeset
2749 if (FRAME_TERMCAP_P (it->f))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2750 valid_p = STRINGP (value);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2751 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2752 valid_p = (STRINGP (value)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2753 || (CONSP (value) && EQ (XCAR (value), Qspace))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2754 || valid_image_p (value));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2755 #else /* not HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2756 valid_p = STRINGP (value);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2757 #endif /* not HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2758
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2759 if ((EQ (location, Qleft_margin)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2760 || EQ (location, Qright_margin)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2761 || NILP (location))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2762 && valid_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2763 {
28804
ddc6811eb4c8 (handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents: 28754
diff changeset
2764 space_or_image_found_p = 1;
ddc6811eb4c8 (handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents: 28754
diff changeset
2765
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2766 /* Save current settings of IT so that we can restore them
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2767 when we are finished with the glyph property value. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2768 push_it (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2769
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2770 if (NILP (location))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2771 it->area = TEXT_AREA;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2772 else if (EQ (location, Qleft_margin))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2773 it->area = LEFT_MARGIN_AREA;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2774 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2775 it->area = RIGHT_MARGIN_AREA;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2776
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2777 if (STRINGP (value))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2778 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2779 it->string = value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2780 it->multibyte_p = STRING_MULTIBYTE (it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2781 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2782 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2783 it->end_charpos = it->string_nchars
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2784 = XSTRING (it->string)->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2785 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2786 it->stop_charpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2787 it->string_from_display_prop_p = 1;
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 else if (CONSP (value) && EQ (XCAR (value), Qspace))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2790 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2791 it->method = next_element_from_stretch;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2792 it->object = value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2793 it->current.pos = it->position = start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2794 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2795 #ifdef HAVE_WINDOW_SYSTEM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2796 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2797 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2798 it->what = IT_IMAGE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2799 it->image_id = lookup_image (it->f, value);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2800 it->position = start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2801 it->object = NILP (object) ? it->w->buffer : object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2802 it->method = next_element_from_image;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2803
29185
239420a3c60d (Fdump_glyph_matrix): Declare the arg.
Dave Love <fx@gnu.org>
parents: 29023
diff changeset
2804 /* Say that we haven't consumed the characters with
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2805 `display' property yet. The call to pop_it in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2806 set_iterator_to_next will clean this up. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2807 *position = start_pos;
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 #endif /* HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2810 }
28804
ddc6811eb4c8 (handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents: 28754
diff changeset
2811 else
ddc6811eb4c8 (handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents: 28754
diff changeset
2812 /* Invalid property or property not supported. Restore
ddc6811eb4c8 (handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents: 28754
diff changeset
2813 the position to what it was before. */
ddc6811eb4c8 (handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents: 28754
diff changeset
2814 *position = start_pos;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2815 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2816
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2817 return space_or_image_found_p;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2820
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2821 /* Check if PROP is a display sub-property value whose text should be
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2822 treated as intangible. */
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2823
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2824 static int
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2825 single_display_prop_intangible_p (prop)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2826 Lisp_Object prop;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2827 {
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2828 /* Skip over `when FORM'. */
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2829 if (CONSP (prop) && EQ (XCAR (prop), Qwhen))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2830 {
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2831 prop = XCDR (prop);
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2832 if (!CONSP (prop))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2833 return 0;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2834 prop = XCDR (prop);
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2835 }
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2836
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2837 if (!CONSP (prop))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2838 return 0;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2839
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2840 /* Skip over `margin LOCATION'. If LOCATION is in the margins,
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2841 we don't need to treat text as intangible. */
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2842 if (EQ (XCAR (prop), Qmargin))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2843 {
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2844 prop = XCDR (prop);
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2845 if (!CONSP (prop))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2846 return 0;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2847
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2848 prop = XCDR (prop);
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2849 if (!CONSP (prop)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2850 || EQ (XCAR (prop), Qleft_margin)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2851 || EQ (XCAR (prop), Qright_margin))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2852 return 0;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2853 }
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2854
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2855 return CONSP (prop) && EQ (XCAR (prop), Qimage);
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2856 }
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2857
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2858
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2859 /* Check if PROP is a display property value whose text should be
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2860 treated as intangible. */
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2861
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2862 int
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2863 display_prop_intangible_p (prop)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2864 Lisp_Object prop;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2865 {
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2866 if (CONSP (prop)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2867 && CONSP (XCAR (prop))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2868 && !EQ (Qmargin, XCAR (XCAR (prop))))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2869 {
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2870 /* A list of sub-properties. */
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2871 while (CONSP (prop))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2872 {
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2873 if (single_display_prop_intangible_p (XCAR (prop)))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2874 return 1;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2875 prop = XCDR (prop);
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2876 }
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2877 }
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2878 else if (VECTORP (prop))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2879 {
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2880 /* A vector of sub-properties. */
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2881 int i;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2882 for (i = 0; i < XVECTOR (prop)->size; ++i)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2883 if (single_display_prop_intangible_p (XVECTOR (prop)->contents[i]))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2884 return 1;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2885 }
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2886 else
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2887 return single_display_prop_intangible_p (prop);
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2888
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2889 return 0;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2890 }
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2891
25012
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 /***********************************************************************
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2894 `composition' property
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2895 ***********************************************************************/
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2896
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2897 /* Set up iterator IT from `composition' property at its current
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2898 position. Called from handle_stop. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2899
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2900 static enum prop_handled
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2901 handle_composition_prop (it)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2902 struct it *it;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2903 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2904 Lisp_Object prop, string;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2905 int pos, pos_byte, end;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2906 enum prop_handled handled = HANDLED_NORMALLY;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2907
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2908 if (STRINGP (it->string))
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2909 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2910 pos = IT_STRING_CHARPOS (*it);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2911 pos_byte = IT_STRING_BYTEPOS (*it);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2912 string = it->string;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2913 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2914 else
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2915 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2916 pos = IT_CHARPOS (*it);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2917 pos_byte = IT_BYTEPOS (*it);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2918 string = Qnil;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2919 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2920
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2921 /* If there's a valid composition and point is not inside of the
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2922 composition (in the case that the composition is from the current
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2923 buffer), draw a glyph composed from the composition components. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2924 if (find_composition (pos, -1, &pos, &end, &prop, string)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2925 && COMPOSITION_VALID_P (pos, end, prop)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2926 && (STRINGP (it->string) || (PT <= pos || PT >= end)))
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2927 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2928 int id = get_composition_id (pos, pos_byte, end - pos, prop, string);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2929
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2930 if (id >= 0)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2931 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2932 it->method = next_element_from_composition;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2933 it->cmp_id = id;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2934 it->cmp_len = COMPOSITION_LENGTH (prop);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2935 /* For a terminal, draw only the first character of the
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2936 components. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2937 it->c = COMPOSITION_GLYPH (composition_table[id], 0);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2938 it->len = (STRINGP (it->string)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2939 ? string_char_to_byte (it->string, end)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2940 : CHAR_TO_BYTE (end)) - pos_byte;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2941 it->stop_charpos = end;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2942 handled = HANDLED_RETURN;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2943 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2944 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2945
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2946 return handled;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2947 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2948
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2949
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2950
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2951 /***********************************************************************
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2952 Overlay strings
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2953 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2954
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2955 /* The following structure is used to record overlay strings for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2956 later sorting in load_overlay_strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2957
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2958 struct overlay_entry
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2959 {
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
2960 Lisp_Object overlay;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2961 Lisp_Object string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2962 int priority;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2963 int after_string_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2964 };
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2967 /* Set up iterator IT from overlay strings at its current position.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2968 Called from handle_stop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2969
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2970 static enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2971 handle_overlay_change (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2972 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2973 {
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
2974 if (!STRINGP (it->string) && get_overlay_strings (it))
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
2975 return HANDLED_RECOMPUTE_PROPS;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2976 else
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
2977 return HANDLED_NORMALLY;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2978 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2979
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2980
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2981 /* 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
2982 overlay string to deliver. Called by set_iterator_to_next when the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2983 end of the current overlay string is reached. If there are more
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2984 overlay strings to display, IT->string and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2985 IT->current.overlay_string_index are set appropriately here.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2986 Otherwise IT->string is set to nil. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2989 next_overlay_string (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2990 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2991 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2992 ++it->current.overlay_string_index;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2993 if (it->current.overlay_string_index == it->n_overlay_strings)
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 /* No more overlay strings. Restore IT's settings to what
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2996 they were before overlay strings were processed, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2997 continue to deliver from current_buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2998 pop_it (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2999 xassert (it->stop_charpos >= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3000 && it->stop_charpos <= it->end_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3001 it->string = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3002 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3003 SET_TEXT_POS (it->current.string_pos, -1, -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3004 it->n_overlay_strings = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3005 it->method = next_element_from_buffer;
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3006
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3007 /* If we're at the end of the buffer, record that we have
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3008 processed the overlay strings there already, so that
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3009 next_element_from_buffer doesn't try it again. */
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3010 if (IT_CHARPOS (*it) >= it->end_charpos)
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3011 it->overlay_strings_at_end_processed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3012 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3013 else
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 /* There are more overlay strings to process. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3016 IT->current.overlay_string_index has advanced to a position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3017 where we must load IT->overlay_strings with more strings, do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3018 it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3019 int i = it->current.overlay_string_index % OVERLAY_STRING_CHUNK_SIZE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3020
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3021 if (it->current.overlay_string_index && i == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3022 load_overlay_strings (it);
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 /* Initialize IT to deliver display elements from the overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3025 string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3026 it->string = it->overlay_strings[i];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3027 it->multibyte_p = STRING_MULTIBYTE (it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3028 SET_TEXT_POS (it->current.string_pos, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3029 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3030 it->stop_charpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3031 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3032
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3033 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3034 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3037 /* Compare two overlay_entry structures E1 and E2. Used as a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3038 comparison function for qsort in load_overlay_strings. Overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3039 strings for the same position are sorted so that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3040
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3041 1. All after-strings come in front of before-strings, except
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3042 when they come from the same overlay.
25012
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 2. Within after-strings, strings are sorted so that overlay strings
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3045 from overlays with higher priorities come first.
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 2. Within before-strings, strings are sorted so that overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3048 strings from overlays with higher priorities come last.
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 Value is analogous to strcmp. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3051
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3052
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3053 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3054 compare_overlay_entries (e1, e2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3055 void *e1, *e2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3056 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3057 struct overlay_entry *entry1 = (struct overlay_entry *) e1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3058 struct overlay_entry *entry2 = (struct overlay_entry *) e2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3059 int result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3060
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3061 if (entry1->after_string_p != entry2->after_string_p)
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3062 {
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3063 /* Let after-strings appear in front of before-strings if
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3064 they come from different overlays. */
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3065 if (EQ (entry1->overlay, entry2->overlay))
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3066 result = entry1->after_string_p ? 1 : -1;
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3067 else
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3068 result = entry1->after_string_p ? -1 : 1;
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3069 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3070 else if (entry1->after_string_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3071 /* After-strings sorted in order of decreasing priority. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3072 result = entry2->priority - entry1->priority;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3073 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3074 /* Before-strings sorted in order of increasing priority. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3075 result = entry1->priority - entry2->priority;
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 return result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3078 }
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 /* Load the vector IT->overlay_strings with overlay strings from IT's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3082 current buffer position. Set IT->n_overlays to the total number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3083 overlay strings found.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3084
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3085 Overlay strings are processed OVERLAY_STRING_CHUNK_SIZE strings at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3086 a time. On entry into load_overlay_strings,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3087 IT->current.overlay_string_index gives the number of overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3088 strings that have already been loaded by previous calls to this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3089 function.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3090
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3091 IT->add_overlay_start contains an additional overlay start
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3092 position to consider for taking overlay strings from, if non-zero.
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3093 This position comes into play when the overlay has an `invisible'
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3094 property, and both before and after-strings. When we've skipped to
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3095 the end of the overlay, because of its `invisible' property, we
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3096 nevertheless want its before-string to appear.
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3097 IT->add_overlay_start will contain the overlay start position
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3098 in this case.
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3099
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3100 Overlay strings are sorted so that after-string strings come in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3101 front of before-string strings. Within before and after-strings,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3102 strings are sorted by overlay priority. See also function
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3103 compare_overlay_entries. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3104
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3105 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3106 load_overlay_strings (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3107 struct it *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 extern Lisp_Object Qafter_string, Qbefore_string, Qwindow, Qpriority;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3110 Lisp_Object ov, overlay, window, str, invisible;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3111 int start, end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3112 int size = 20;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3113 int n = 0, i, j, invis_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3114 struct overlay_entry *entries
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3115 = (struct overlay_entry *) alloca (size * sizeof *entries);
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3116 int charpos = IT_CHARPOS (*it);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3117
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3118 /* Append the overlay string STRING of overlay OVERLAY to vector
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3119 `entries' which has size `size' and currently contains `n'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3120 elements. AFTER_P non-zero means STRING is an after-string of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3121 OVERLAY. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3122 #define RECORD_OVERLAY_STRING(OVERLAY, STRING, AFTER_P) \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3123 do \
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 Lisp_Object priority; \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3126 \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3127 if (n == size) \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3128 { \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3129 int new_size = 2 * size; \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3130 struct overlay_entry *old = entries; \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3131 entries = \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3132 (struct overlay_entry *) alloca (new_size \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3133 * sizeof *entries); \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3134 bcopy (old, entries, size * sizeof *entries); \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3135 size = new_size; \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3136 } \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3137 \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3138 entries[n].string = (STRING); \
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3139 entries[n].overlay = (OVERLAY); \
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3140 priority = Foverlay_get ((OVERLAY), Qpriority); \
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3141 entries[n].priority = INTEGERP (priority) ? XINT (priority) : 0; \
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3142 entries[n].after_string_p = (AFTER_P); \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3143 ++n; \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3144 } \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3145 while (0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3146
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3147 /* Process overlay before the overlay center. */
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3148 for (ov = current_buffer->overlays_before; CONSP (ov); ov = XCDR (ov))
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
3149 {
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
3150 overlay = XCAR (ov);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3151 xassert (OVERLAYP (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3152 start = OVERLAY_POSITION (OVERLAY_START (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3153 end = OVERLAY_POSITION (OVERLAY_END (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3154
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3155 if (end < charpos)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3156 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3157
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3158 /* 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
3159 position. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3160 if (end != charpos && start != charpos)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3161 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3162
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3163 /* Skip this overlay if it doesn't apply to IT->w. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3164 window = Foverlay_get (overlay, Qwindow);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3165 if (WINDOWP (window) && XWINDOW (window) != it->w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3166 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3167
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3168 /* If the text ``under'' the overlay is invisible, both before-
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3169 and after-strings from this overlay are visible; start and
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3170 end position are indistinguishable. */
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3171 invisible = Foverlay_get (overlay, Qinvisible);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3172 invis_p = TEXT_PROP_MEANS_INVISIBLE (invisible);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3173
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3174 /* If overlay has a non-empty before-string, record it. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3175 if ((start == charpos || (end == charpos && invis_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3176 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3177 && XSTRING (str)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3178 RECORD_OVERLAY_STRING (overlay, str, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3179
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3180 /* If overlay has a non-empty after-string, record it. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3181 if ((end == charpos || (start == charpos && invis_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3182 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3183 && XSTRING (str)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3184 RECORD_OVERLAY_STRING (overlay, str, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3185 }
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 /* Process overlays after the overlay center. */
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3188 for (ov = current_buffer->overlays_after; CONSP (ov); ov = XCDR (ov))
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
3189 {
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
3190 overlay = XCAR (ov);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3191 xassert (OVERLAYP (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3192 start = OVERLAY_POSITION (OVERLAY_START (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3193 end = OVERLAY_POSITION (OVERLAY_END (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3194
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3195 if (start > charpos)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3196 break;
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 /* 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
3199 position. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3200 if (end != charpos && start != charpos)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3201 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3202
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3203 /* Skip this overlay if it doesn't apply to IT->w. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3204 window = Foverlay_get (overlay, Qwindow);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3205 if (WINDOWP (window) && XWINDOW (window) != it->w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3206 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3207
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3208 /* If the text ``under'' the overlay is invisible, it has a zero
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3209 dimension, and both before- and after-strings apply. */
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3210 invisible = Foverlay_get (overlay, Qinvisible);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3211 invis_p = TEXT_PROP_MEANS_INVISIBLE (invisible);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3212
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3213 /* If overlay has a non-empty before-string, record it. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3214 if ((start == charpos || (end == charpos && invis_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3215 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3216 && XSTRING (str)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3217 RECORD_OVERLAY_STRING (overlay, str, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3218
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3219 /* If overlay has a non-empty after-string, record it. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3220 if ((end == charpos || (start == charpos && invis_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3221 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3222 && XSTRING (str)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3223 RECORD_OVERLAY_STRING (overlay, str, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3224 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3225
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3226 #undef RECORD_OVERLAY_STRING
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3227
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3228 /* Sort entries. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3229 if (n > 1)
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3230 qsort (entries, n, sizeof *entries, compare_overlay_entries);
25012
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 /* Record the total number of strings to process. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3233 it->n_overlay_strings = n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3234
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3235 /* IT->current.overlay_string_index is the number of overlay strings
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3236 that have already been consumed by IT. Copy some of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3237 remaining overlay strings to IT->overlay_strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3238 i = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3239 j = it->current.overlay_string_index;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3240 while (i < OVERLAY_STRING_CHUNK_SIZE && j < n)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3241 it->overlay_strings[i++] = entries[j++].string;
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3242
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3243 CHECK_IT (it);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3247 /* Get the first chunk of overlay strings at IT's current buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3248 position. Value is non-zero if at least one overlay string was
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3249 found. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3250
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3251 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3252 get_overlay_strings (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3253 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3254 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3255 /* Get the first OVERLAY_STRING_CHUNK_SIZE overlay strings to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3256 process. This fills IT->overlay_strings with strings, and sets
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3257 IT->n_overlay_strings to the total number of strings to process.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3258 IT->pos.overlay_string_index has to be set temporarily to zero
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3259 because load_overlay_strings needs this; it must be set to -1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3260 when no overlay strings are found because a zero value would
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3261 indicate a position in the first overlay string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3262 it->current.overlay_string_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3263 load_overlay_strings (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3264
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3265 /* If we found overlay strings, set up IT to deliver display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3266 elements from the first one. Otherwise set up IT to deliver
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3267 from current_buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3268 if (it->n_overlay_strings)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3269 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3270 /* Make sure we know settings in current_buffer, so that we can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3271 restore meaningful values when we're done with the overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3272 strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3273 compute_stop_pos (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3274 xassert (it->face_id >= 0);
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 /* Save IT's settings. They are restored after all overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3277 strings have been processed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3278 xassert (it->sp == 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3279 push_it (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3280
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3281 /* Set up IT to deliver display elements from the first overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3282 string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3283 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3284 it->stop_charpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3285 it->string = it->overlay_strings[0];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3286 it->multibyte_p = STRING_MULTIBYTE (it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3287 xassert (STRINGP (it->string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3288 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3289 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3290 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3291 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3292 it->string = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3293 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3294 it->method = next_element_from_buffer;
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 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3298
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3299 /* Value is non-zero if we found at least one overlay string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3300 return STRINGP (it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3301 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3302
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3303
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3304
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3305 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3306 Saving and restoring state
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3307 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3308
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3309 /* Save current settings of IT on IT->stack. Called, for example,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3310 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
3311 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
3312 processed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3313
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3314 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3315 push_it (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3316 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3317 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3318 struct iterator_stack_entry *p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3319
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3320 xassert (it->sp < 2);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3321 p = it->stack + it->sp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3322
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3323 p->stop_charpos = it->stop_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3324 xassert (it->face_id >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3325 p->face_id = it->face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3326 p->string = it->string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3327 p->pos = it->current;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3328 p->end_charpos = it->end_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3329 p->string_nchars = it->string_nchars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3330 p->area = it->area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3331 p->multibyte_p = it->multibyte_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3332 p->space_width = it->space_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3333 p->font_height = it->font_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3334 p->voffset = it->voffset;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3335 p->string_from_display_prop_p = it->string_from_display_prop_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3336 ++it->sp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3337 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3338
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3339
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3340 /* Restore IT's settings from IT->stack. Called, for example, when no
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3341 more overlay strings must be processed, and we return to delivering
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3342 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
3343 `display' property is reached and we return to delivering display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3344 elements from an overlay string, or from a buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3345
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3346 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3347 pop_it (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3348 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3349 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3350 struct iterator_stack_entry *p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3351
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3352 xassert (it->sp > 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3353 --it->sp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3354 p = it->stack + it->sp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3355 it->stop_charpos = p->stop_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3356 it->face_id = p->face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3357 it->string = p->string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3358 it->current = p->pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3359 it->end_charpos = p->end_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3360 it->string_nchars = p->string_nchars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3361 it->area = p->area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3362 it->multibyte_p = p->multibyte_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3363 it->space_width = p->space_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3364 it->font_height = p->font_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3365 it->voffset = p->voffset;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3366 it->string_from_display_prop_p = p->string_from_display_prop_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3367 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3370
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3371 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3372 Moving over lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3373 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3374
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3375 /* Set IT's current position to the previous line start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3376
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3377 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3378 back_to_previous_line_start (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3379 struct it *it;
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 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
3382 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3383 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3384
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3385
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3386 /* Move IT to the next line start.
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3387
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3388 Value is non-zero if a newline was found. Set *SKIPPED_P to 1 if
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3389 we skipped over part of the text (as opposed to moving the iterator
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3390 continuously over the text). Otherwise, don't change the value
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3391 of *SKIPPED_P.
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3392
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3393 Newlines may come from buffer text, overlay strings, or strings
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3394 displayed via the `display' property. That's the reason we can't
33916
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3395 simply use find_next_newline_no_quit.
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3396
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3397 Note that this function may not skip over invisible text that is so
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3398 because of text properties and immediately follows a newline. If
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3399 it would, function reseat_at_next_visible_line_start, when called
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3400 from set_iterator_to_next, would effectively make invisible
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3401 characters following a newline part of the wrong glyph row, which
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3402 leads to wrong cursor motion. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3403
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3404 static int
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3405 forward_to_next_line_start (it, skipped_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3406 struct it *it;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3407 int *skipped_p;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3408 {
32585
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
3409 int old_selective, newline_found_p, n;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3410 const int MAX_NEWLINE_DISTANCE = 500;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3411
33916
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3412 /* If already on a newline, just consume it to avoid unintended
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3413 skipping over invisible text below. */
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3414 if (ITERATOR_AT_END_OF_LINE_P (it))
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3415 {
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3416 set_iterator_to_next (it, 0);
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3417 return 1;
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3418 }
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3419
32585
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
3420 /* Don't handle selective display in the following. It's (a)
33916
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3421 unnecessary because it's done by the caller, and (b) leads to an
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3422 infinite recursion because next_element_from_ellipsis indirectly
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3423 calls this function. */
32585
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
3424 old_selective = it->selective;
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
3425 it->selective = 0;
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
3426
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3427 /* Scan for a newline within MAX_NEWLINE_DISTANCE display elements
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3428 from buffer text. */
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3429 n = newline_found_p = 0;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3430 while (n < MAX_NEWLINE_DISTANCE
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3431 && get_next_display_element (it)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3432 && !newline_found_p)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3433 {
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3434 newline_found_p = ITERATOR_AT_END_OF_LINE_P (it);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3435 set_iterator_to_next (it, 0);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3436 if (!STRINGP (it->string))
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3437 ++n;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3438 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3439
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3440 /* If we didn't find a newline near enough, see if we can use a
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3441 short-cut. */
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3442 if (!newline_found_p && n == MAX_NEWLINE_DISTANCE)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3443 {
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3444 int start = IT_CHARPOS (*it);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3445 int limit = find_next_newline_no_quit (start, 1);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3446 Lisp_Object pos;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3447
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3448 xassert (!STRINGP (it->string));
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3449
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3450 /* If there isn't any `display' property in sight, and no
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3451 overlays, we can just use the position of the newline in
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3452 buffer text. */
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3453 if (it->stop_charpos >= limit
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3454 || ((pos = Fnext_single_property_change (make_number (start),
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3455 Qdisplay,
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3456 Qnil, make_number (limit)),
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3457 NILP (pos))
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3458 && next_overlay_change (start) == ZV))
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3459 {
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3460 IT_CHARPOS (*it) = limit;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3461 IT_BYTEPOS (*it) = CHAR_TO_BYTE (limit);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3462 *skipped_p = newline_found_p = 1;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3463 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3464 else
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3465 {
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3466 while (get_next_display_element (it)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3467 && !newline_found_p)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3468 {
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3469 newline_found_p = ITERATOR_AT_END_OF_LINE_P (it);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3470 set_iterator_to_next (it, 0);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3471 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3472 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3473 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3474
32585
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
3475 it->selective = old_selective;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3476 return newline_found_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3477 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3478
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3479
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3480 /* Set IT's current position to the previous visible line start. Skip
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3481 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
3482 selective display. Caution: this does not change IT->current_x and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3483 IT->hpos. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3486 back_to_previous_visible_line_start (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3487 struct it *it;
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 int visible_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3490
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3491 /* Go back one newline if not on BEGV already. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3492 if (IT_CHARPOS (*it) > BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3493 back_to_previous_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3494
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3495 /* Move over lines that are invisible because of selective display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3496 or text properties. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3497 while (IT_CHARPOS (*it) > BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3498 && !visible_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3499 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3500 visible_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3501
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3502 /* If selective > 0, then lines indented more than that values
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3503 are invisible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3504 if (it->selective > 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3505 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3506 it->selective))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3507 visible_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3508 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3509 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3510 Lisp_Object prop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3511
28464
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
3512 prop = Fget_char_property (make_number (IT_CHARPOS (*it)),
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
3513 Qinvisible, it->window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3514 if (TEXT_PROP_MEANS_INVISIBLE (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3515 visible_p = 0;
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 /* Back one more newline if the current one is invisible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3519 if (!visible_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3520 back_to_previous_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3521 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3522
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3523 xassert (IT_CHARPOS (*it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3524 xassert (IT_CHARPOS (*it) == BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3525 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3526 CHECK_IT (it);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3529
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3530 /* Reseat iterator IT at the previous visible line start. Skip
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3531 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
3532 selective display. At the end, update IT's overlay information,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3533 face information etc. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3534
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3535 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3536 reseat_at_previous_visible_line_start (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3537 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3538 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3539 back_to_previous_visible_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3540 reseat (it, it->current.pos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3541 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3542 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3543
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3544
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3545 /* 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
3546 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
3547 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
3548 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
3549 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
3550 is invisible because of text properties. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3551
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3552 static void
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3553 reseat_at_next_visible_line_start (it, on_newline_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3554 struct it *it;
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3555 int on_newline_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3556 {
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3557 int newline_found_p, skipped_p = 0;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3558
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3559 newline_found_p = forward_to_next_line_start (it, &skipped_p);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3560
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3561 /* Skip over lines that are invisible because they are indented
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3562 more than the value of IT->selective. */
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3563 if (it->selective > 0)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3564 while (IT_CHARPOS (*it) < ZV
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3565 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it),
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3566 it->selective))
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3567 newline_found_p = forward_to_next_line_start (it, &skipped_p);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3568
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3569 /* Position on the newline if that's what's requested. */
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3570 if (on_newline_p && newline_found_p)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3571 {
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3572 if (STRINGP (it->string))
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3573 {
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3574 if (IT_STRING_CHARPOS (*it) > 0)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3575 {
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3576 --IT_STRING_CHARPOS (*it);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3577 --IT_STRING_BYTEPOS (*it);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3578 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3579 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3580 else if (IT_CHARPOS (*it) > BEGV)
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3581 {
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3582 --IT_CHARPOS (*it);
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3583 --IT_BYTEPOS (*it);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3584 reseat (it, it->current.pos, 0);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3585 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3586 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3587 else if (skipped_p)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3588 reseat (it, it->current.pos, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3589
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3590 CHECK_IT (it);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3593
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3594
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3595 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3596 Changing an iterator's position
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 /* 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
3600 is non-zero, always check for text properties at the new position.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3601 Otherwise, text properties are only looked up if POS >=
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3602 IT->check_charpos of a property. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3603
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3604 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3605 reseat (it, pos, force_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3606 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3607 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3608 int force_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3609 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3610 int original_pos = IT_CHARPOS (*it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3611
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3612 reseat_1 (it, pos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3613
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3614 /* Determine where to check text properties. Avoid doing it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3615 where possible because text property lookup is very expensive. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3616 if (force_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3617 || CHARPOS (pos) > it->stop_charpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3618 || CHARPOS (pos) < original_pos)
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 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3622 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3623
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 /* 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
3626 IT->stop_pos to POS, also. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3629 reseat_1 (it, pos, set_stop_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3630 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3631 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3632 int set_stop_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3633 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3634 /* Don't call this function when scanning a C string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3635 xassert (it->s == NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3636
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3637 /* POS must be a reasonable value. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3638 xassert (CHARPOS (pos) >= BEGV && CHARPOS (pos) <= ZV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3639
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3640 it->current.pos = it->position = pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3641 XSETBUFFER (it->object, current_buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3642 it->dpvec = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3643 it->current.dpvec_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3644 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3645 IT_STRING_CHARPOS (*it) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3646 IT_STRING_BYTEPOS (*it) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3647 it->string = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3648 it->method = next_element_from_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3649 it->sp = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3650
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3651 if (set_stop_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3652 it->stop_charpos = CHARPOS (pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3653 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3654
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3655
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3656 /* 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
3657 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
3658 STRING gives a Lisp string to iterate over.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3659
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3660 If PRECISION > 0, don't return more then PRECISION number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3661 characters from the string.
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 If FIELD_WIDTH > 0, return padding spaces until FIELD_WIDTH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3664 characters have been returned. FIELD_WIDTH < 0 means an infinite
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3665 field width.
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 MULTIBYTE = 0 means disable processing of multibyte characters,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3668 MULTIBYTE > 0 means enable it,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3669 MULTIBYTE < 0 means use IT->multibyte_p.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3670
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3671 IT must be initialized via a prior call to init_iterator before
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3672 calling this function. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3673
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3674 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3675 reseat_to_string (it, s, string, charpos, precision, field_width, multibyte)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3676 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3677 unsigned char *s;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3678 Lisp_Object string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3679 int charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3680 int precision, field_width, multibyte;
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 /* No region in strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3683 it->region_beg_charpos = it->region_end_charpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3684
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3685 /* No text property checks performed by default, but see below. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3686 it->stop_charpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3687
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3688 /* Set iterator position and end position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3689 bzero (&it->current, sizeof it->current);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3690 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3691 it->current.dpvec_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3692 xassert (charpos >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3693
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3694 /* Use the setting of MULTIBYTE if specified. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3695 if (multibyte >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3696 it->multibyte_p = multibyte > 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3697
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3698 if (s == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3699 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3700 xassert (STRINGP (string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3701 it->string = string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3702 it->s = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3703 it->end_charpos = it->string_nchars = XSTRING (string)->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3704 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3705 it->current.string_pos = string_pos (charpos, string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3706 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3707 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3708 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3709 it->s = s;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3710 it->string = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3711
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3712 /* Note that we use IT->current.pos, not it->current.string_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3713 for displaying C strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3714 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3715 if (it->multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3716 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3717 it->current.pos = c_string_pos (charpos, s, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3718 it->end_charpos = it->string_nchars = number_of_chars (s, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3719 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3720 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3721 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3722 IT_CHARPOS (*it) = IT_BYTEPOS (*it) = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3723 it->end_charpos = it->string_nchars = strlen (s);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3726 it->method = next_element_from_c_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3727 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3728
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3729 /* PRECISION > 0 means don't return more than PRECISION characters
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3730 from the string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3731 if (precision > 0 && it->end_charpos - charpos > precision)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3732 it->end_charpos = it->string_nchars = charpos + precision;
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 /* FIELD_WIDTH > 0 means pad with spaces until FIELD_WIDTH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3735 characters have been returned. FIELD_WIDTH == 0 means don't pad,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3736 FIELD_WIDTH < 0 means infinite field width. This is useful for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3737 padding with `-' at the end of a mode line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3738 if (field_width < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3739 field_width = INFINITY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3740 if (field_width > it->end_charpos - charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3741 it->end_charpos = charpos + field_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3742
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3743 /* Use the standard display table for displaying strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3744 if (DISP_TABLE_P (Vstandard_display_table))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3745 it->dp = XCHAR_TABLE (Vstandard_display_table);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3746
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3747 it->stop_charpos = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3748 CHECK_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
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3753 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3754 Iteration
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3755 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3756
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3757 /* Load IT's display element fields with information about the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3758 display element from the current position of IT. Value is zero if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3759 end of buffer (or C string) is reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3760
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3761 int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3762 get_next_display_element (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3763 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3764 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3765 /* Non-zero means that we found an display element. Zero means that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3766 we hit the end of what we iterate over. Performance note: the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3767 function pointer `method' used here turns out to be faster than
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3768 using a sequence of if-statements. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3769 int success_p = (*it->method) (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3770
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3771 if (it->what == IT_CHARACTER)
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 /* Map via display table or translate control characters.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3774 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
3775 the function call above. If we have a display table, and it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3776 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
3777 IT->c itself comes from a display table, otherwise we could
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3778 end up in an infinite recursion. (An alternative could be to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3779 count the recursion depth of this function and signal an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3780 error when a certain maximum depth is reached.) Is it worth
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3781 it? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3782 if (success_p && it->dpvec == NULL)
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 Lisp_Object dv;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3785
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3786 if (it->dp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3787 && (dv = DISP_CHAR_VECTOR (it->dp, it->c),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3788 VECTORP (dv)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3789 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3790 struct Lisp_Vector *v = XVECTOR (dv);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3791
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3792 /* Return the first character from the display table
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3793 entry, if not empty. If empty, don't display the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3794 current character. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3795 if (v->size)
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->dpvec_char_len = it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3798 it->dpvec = v->contents;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3799 it->dpend = v->contents + v->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3800 it->current.dpvec_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3801 it->method = next_element_from_display_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3802 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3803
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3804 success_p = get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3805 }
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 /* Translate control characters into `\003' or `^C' form.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3808 Control characters coming from a display table entry are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3809 currently not translated because we use IT->dpvec to hold
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3810 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
3811 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
3812
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3813 Non-printable multibyte characters are also translated
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3814 octal form. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3815 else if ((it->c < ' '
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3816 && (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
3817 || (it->c != '\n' && it->c != '\t')))
25063
7c69e1001e35 (get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents: 25012
diff changeset
3818 || (it->c >= 127
25500
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3819 && it->len == 1)
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3820 || !CHAR_PRINTABLE_P (it->c))
25012
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 /* IT->c is a control character which must be displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3823 either as '\003' or as `^C' where the '\\' and '^'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3824 can be defined in the display table. Fill
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3825 IT->ctl_chars with glyphs for what we have to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3826 display. Then, set IT->dpvec to these glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3827 GLYPH g;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3828
25063
7c69e1001e35 (get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents: 25012
diff changeset
3829 if (it->c < 128 && it->ctl_arrow_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3830 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3831 /* Set IT->ctl_chars[0] to the glyph for `^'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3832 if (it->dp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3833 && INTEGERP (DISP_CTRL_GLYPH (it->dp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3834 && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (it->dp))))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3835 g = XINT (DISP_CTRL_GLYPH (it->dp));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3836 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3837 g = FAST_MAKE_GLYPH ('^', 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3838 XSETINT (it->ctl_chars[0], g);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3839
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3840 g = FAST_MAKE_GLYPH (it->c ^ 0100, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3841 XSETINT (it->ctl_chars[1], g);
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 /* Set up IT->dpvec and return first character from it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3844 it->dpvec_char_len = it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3845 it->dpvec = it->ctl_chars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3846 it->dpend = it->dpvec + 2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3847 it->current.dpvec_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3848 it->method = next_element_from_display_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3849 get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3850 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3851 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3852 {
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3853 unsigned char str[MAX_MULTIBYTE_LENGTH];
29023
af50e87cc257 (get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents: 28984
diff changeset
3854 int len;
25500
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3855 int i;
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3856 GLYPH escape_glyph;
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3857
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3858 /* Set IT->ctl_chars[0] to the glyph for `\\'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3859 if (it->dp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3860 && INTEGERP (DISP_ESCAPE_GLYPH (it->dp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3861 && 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
3862 escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3863 else
25500
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3864 escape_glyph = FAST_MAKE_GLYPH ('\\', 0);
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3865
29023
af50e87cc257 (get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents: 28984
diff changeset
3866 if (SINGLE_BYTE_CHAR_P (it->c))
af50e87cc257 (get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents: 28984
diff changeset
3867 str[0] = it->c, len = 1;
af50e87cc257 (get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents: 28984
diff changeset
3868 else
af50e87cc257 (get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents: 28984
diff changeset
3869 len = CHAR_STRING (it->c, str);
af50e87cc257 (get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents: 28984
diff changeset
3870
25500
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3871 for (i = 0; i < len; i++)
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3872 {
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3873 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
3874 /* 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
3875 the octal display of the character. */
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3876 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
3877 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
3878 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
3879 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
3880 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
3881 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
3882 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3883
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3884 /* Set up IT->dpvec and return the first character
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3885 from it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3886 it->dpvec_char_len = it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3887 it->dpvec = it->ctl_chars;
25500
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3888 it->dpend = it->dpvec + len * 4;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3889 it->current.dpvec_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3890 it->method = next_element_from_display_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3891 get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3892 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3893 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3894 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3895
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
3896 /* Adjust face id for a multibyte character. There are no
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
3897 multibyte character in unibyte text. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3898 if (it->multibyte_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3899 && success_p
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
3900 && FRAME_WINDOW_P (it->f))
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
3901 {
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
3902 struct face *face = FACE_FROM_ID (it->f, it->face_id);
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
3903 it->face_id = FACE_FOR_CHAR (it->f, face, it->c);
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 /* Is this character the last one of a run of characters with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3908 box? If yes, set IT->end_of_box_run_p to 1. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3909 if (it->face_box_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3910 && it->s == NULL)
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 int face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3913 struct face *face;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3914
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3915 it->end_of_box_run_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3916 = ((face_id = face_after_it_pos (it),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3917 face_id != it->face_id)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3918 && (face = FACE_FROM_ID (it->f, face_id),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3919 face->box == FACE_NO_BOX));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3920 }
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 /* Value is 0 if end of buffer or string reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3923 return success_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3924 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3927 /* Move IT to the next display element.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3928
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3929 RESEAT_P non-zero means if called on a newline in buffer text,
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3930 skip to the next visible line start.
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3931
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3932 Functions get_next_display_element and set_iterator_to_next are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3933 separate because I find this arrangement easier to handle than a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3934 get_next_display_element function that also increments IT's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3935 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
3936 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
3937 increment the iterator position. The other way around we probably
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3938 would either need a flag indicating whether the iterator has to be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3939 incremented the next time, or we would have to implement a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3940 decrement position function which would not be easy to write. */
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 void
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3943 set_iterator_to_next (it, reseat_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3944 struct it *it;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3945 int reseat_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3946 {
32553
2bd19f54cd7a (set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents: 32539
diff changeset
3947 /* Reset flags indicating start and end of a sequence of characters
2bd19f54cd7a (set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents: 32539
diff changeset
3948 with box. Reset them at the start of this function because
2bd19f54cd7a (set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents: 32539
diff changeset
3949 moving the iterator to a new position might set them. */
2bd19f54cd7a (set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents: 32539
diff changeset
3950 it->start_of_box_run_p = it->end_of_box_run_p = 0;
2bd19f54cd7a (set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents: 32539
diff changeset
3951
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3952 if (it->method == next_element_from_buffer)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3953 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3954 /* The current display element of IT is a character from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3955 current_buffer. Advance in the buffer, and maybe skip over
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3956 invisible lines that are so because of selective display. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3957 if (ITERATOR_AT_END_OF_LINE_P (it) && reseat_p)
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3958 reseat_at_next_visible_line_start (it, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3959 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3960 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3961 xassert (it->len != 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3962 IT_BYTEPOS (*it) += it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3963 IT_CHARPOS (*it) += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3964 xassert (IT_BYTEPOS (*it) == CHAR_TO_BYTE (IT_CHARPOS (*it)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3965 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3966 }
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3967 else if (it->method == next_element_from_composition)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3968 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3969 xassert (it->cmp_id >= 0 && it ->cmp_id < n_compositions);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3970 if (STRINGP (it->string))
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3971 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3972 IT_STRING_BYTEPOS (*it) += it->len;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3973 IT_STRING_CHARPOS (*it) += it->cmp_len;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3974 it->method = next_element_from_string;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3975 goto consider_string_end;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3976 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3977 else
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3978 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3979 IT_BYTEPOS (*it) += it->len;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3980 IT_CHARPOS (*it) += it->cmp_len;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3981 it->method = next_element_from_buffer;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3982 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3983 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3984 else if (it->method == next_element_from_c_string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3985 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3986 /* Current display element of IT is from a C string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3987 IT_BYTEPOS (*it) += it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3988 IT_CHARPOS (*it) += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3989 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3990 else if (it->method == next_element_from_display_vector)
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 /* Current display element of IT is from a display table entry.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3993 Advance in the display table definition. Reset it to null if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3994 end reached, and continue with characters from buffers/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3995 strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3996 ++it->current.dpvec_index;
25197
fbe149852f1c (set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents: 25188
diff changeset
3997
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
3998 /* Restore face of the iterator to what they were before the
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
3999 display vector entry (these entries may contain faces). */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4000 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
4001
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4002 if (it->dpvec + it->current.dpvec_index == it->dpend)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4003 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4004 if (it->s)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4005 it->method = next_element_from_c_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4006 else if (STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4007 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4008 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4009 it->method = next_element_from_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4010
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4011 it->dpvec = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4012 it->current.dpvec_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4013
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
4014 /* 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
4015 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
4016 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
4017 else if (it->dpvec_char_len > 0)
25012
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 it->len = it->dpvec_char_len;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
4020 set_iterator_to_next (it, reseat_p);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4021 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4022 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4023 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4024 else if (it->method == next_element_from_string)
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 /* Current display element is a character from a Lisp string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4027 xassert (it->s == NULL && STRINGP (it->string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4028 IT_STRING_BYTEPOS (*it) += it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4029 IT_STRING_CHARPOS (*it) += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4030
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4031 consider_string_end:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4032
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4033 if (it->current.overlay_string_index >= 0)
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 /* IT->string is an overlay string. Advance to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4036 next, if there is one. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4037 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4038 next_overlay_string (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4039 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4040 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4041 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4042 /* IT->string is not an overlay string. If we reached
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4043 its end, and there is something on IT->stack, proceed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4044 with what is on the stack. This can be either another
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4045 string, this time an overlay string, or a buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4046 if (IT_STRING_CHARPOS (*it) == XSTRING (it->string)->size
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4047 && it->sp > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4048 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4049 pop_it (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4050 if (!STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4051 it->method = next_element_from_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4052 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4053 }
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 (it->method == next_element_from_image
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4056 || it->method == next_element_from_stretch)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4057 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4058 /* The position etc with which we have to proceed are on
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4059 the stack. The position may be at the end of a string,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4060 if the `display' property takes up the whole string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4061 pop_it (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4062 it->image_id = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4063 if (STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4064 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4065 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4066 goto consider_string_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4067 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4068 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4069 it->method = next_element_from_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4070 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4071 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4072 /* There are no other methods defined, so this should be a bug. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4073 abort ();
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 xassert (it->method != next_element_from_string
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4076 || (STRINGP (it->string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4077 && IT_STRING_CHARPOS (*it) >= 0));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4078 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4079
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 /* Load IT's display element fields with information about the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4082 display element which comes from a display table entry or from the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4083 result of translating a control character to one of the forms `^C'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4084 or `\003'. IT->dpvec holds the glyphs to return as characters. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4085
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4086 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4087 next_element_from_display_vector (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4088 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4089 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4090 /* Precondition. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4091 xassert (it->dpvec && it->current.dpvec_index >= 0);
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 /* Remember the current face id in case glyphs specify faces.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4094 IT's face is restored in set_iterator_to_next. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4095 it->saved_face_id = it->face_id;
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 if (INTEGERP (*it->dpvec)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4098 && GLYPH_CHAR_VALID_P (XFASTINT (*it->dpvec)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4099 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4100 int lface_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4101 GLYPH g;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4102
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4103 g = XFASTINT (it->dpvec[it->current.dpvec_index]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4104 it->c = FAST_GLYPH_CHAR (g);
29023
af50e87cc257 (get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents: 28984
diff changeset
4105 it->len = CHAR_BYTES (it->c);
25012
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 /* 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
4108 the id of a Lisp face, not a realized face. A face id of
30448
92e758e908a2 (next_element_from_display_vector): Improve comments.
Gerd Moellmann <gerd@gnu.org>
parents: 30413
diff changeset
4109 zero means no face is specified. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4110 lface_id = FAST_GLYPH_FACE (g);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4111 if (lface_id)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4112 {
30448
92e758e908a2 (next_element_from_display_vector): Improve comments.
Gerd Moellmann <gerd@gnu.org>
parents: 30413
diff changeset
4113 /* The function returns -1 if lface_id is invalid. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4114 int face_id = ascii_face_of_lisp_face (it->f, lface_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4115 if (face_id >= 0)
30448
92e758e908a2 (next_element_from_display_vector): Improve comments.
Gerd Moellmann <gerd@gnu.org>
parents: 30413
diff changeset
4116 it->face_id = face_id;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4117 }
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4120 /* Display table entry is invalid. Return a space. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4121 it->c = ' ', it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4122
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4123 /* Don't change position and object of the iterator here. They are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4124 still the values of the character that had this display table
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4125 entry or was translated, and that's what we want. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4126 it->what = IT_CHARACTER;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4127 return 1;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4130
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4131 /* Load IT with the next display element from Lisp string IT->string.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4132 IT->current.string_pos is the current position within the string.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4133 If IT->current.overlay_string_index >= 0, the Lisp string is an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4134 overlay string. */
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 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4137 next_element_from_string (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4138 struct it *it;
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 struct text_pos position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4141
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4142 xassert (STRINGP (it->string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4143 xassert (IT_STRING_CHARPOS (*it) >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4144 position = it->current.string_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4145
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4146 /* Time to check for invisible text? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4147 if (IT_STRING_CHARPOS (*it) < it->end_charpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4148 && IT_STRING_CHARPOS (*it) == it->stop_charpos)
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 handle_stop (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4151
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4152 /* Since a handler may have changed IT->method, we must
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4153 recurse here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4154 return get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4155 }
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 (it->current.overlay_string_index >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4158 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4159 /* Get the next character from an overlay string. In overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4160 strings, There is no field width or padding with spaces to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4161 do. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4162 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4163 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4164 it->what = IT_EOB;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4165 return 0;
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 else if (STRING_MULTIBYTE (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4168 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4169 int remaining = (STRING_BYTES (XSTRING (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4170 - IT_STRING_BYTEPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4171 unsigned char *s = (XSTRING (it->string)->data
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4172 + IT_STRING_BYTEPOS (*it));
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
4173 it->c = string_char_and_length (s, remaining, &it->len);
25012
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4176 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4177 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4178 it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4179 }
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 else
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 /* Get the next character from a Lisp string that is not an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4184 overlay string. Such strings come from the mode line, for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4185 example. We may have to pad with spaces, or truncate the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4186 string. See also next_element_from_c_string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4187 if (IT_STRING_CHARPOS (*it) >= it->end_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4188 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4189 it->what = IT_EOB;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4190 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4191 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4192 else if (IT_STRING_CHARPOS (*it) >= it->string_nchars)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4193 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4194 /* Pad with spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4195 it->c = ' ', it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4196 CHARPOS (position) = BYTEPOS (position) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4197 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4198 else if (STRING_MULTIBYTE (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4199 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4200 int maxlen = (STRING_BYTES (XSTRING (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4201 - IT_STRING_BYTEPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4202 unsigned char *s = (XSTRING (it->string)->data
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4203 + IT_STRING_BYTEPOS (*it));
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
4204 it->c = string_char_and_length (s, maxlen, &it->len);
25012
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4207 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4208 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4209 it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4210 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4211 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4212
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4213 /* 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
4214 buffer position in IT->position although it could arguably be a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4215 string position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4216 it->what = IT_CHARACTER;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4217 it->object = it->string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4218 it->position = position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4219 return 1;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4223 /* Load IT with next display element from C string IT->s.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4224 IT->string_nchars is the maximum number of characters to return
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4225 from the string. IT->end_charpos may be greater than
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4226 IT->string_nchars when this function is called, in which case we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4227 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
4228 reached, including padding spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4229
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4230 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4231 next_element_from_c_string (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4232 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4233 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4234 int success_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4235
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4236 xassert (it->s);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4237 it->what = IT_CHARACTER;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4238 BYTEPOS (it->position) = CHARPOS (it->position) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4239 it->object = Qnil;
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 /* 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
4242 width or precision has been specified when the iterator was
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4243 initialized. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4244 if (IT_CHARPOS (*it) >= it->end_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4245 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4246 /* End of the game. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4247 it->what = IT_EOB;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4248 success_p = 0;
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 else if (IT_CHARPOS (*it) >= it->string_nchars)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4251 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4252 /* Pad with spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4253 it->c = ' ', it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4254 BYTEPOS (it->position) = CHARPOS (it->position) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4255 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4256 else if (it->multibyte_p)
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 /* Implementation note: The calls to strlen apparently aren't a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4259 performance problem because there is no noticeable performance
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4260 difference between Emacs running in unibyte or multibyte mode. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4261 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
4262 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
4263 maxlen, &it->len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4264 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4265 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4266 it->c = it->s[IT_BYTEPOS (*it)], it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4267
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4268 return success_p;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4271
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4272 /* Set up IT to return characters from an ellipsis, if appropriate.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4273 The definition of the ellipsis glyphs may come from a display table
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4274 entry. This function Fills IT with the first glyph from the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4275 ellipsis if an ellipsis is to be displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4276
27106
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4277 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4278 next_element_from_ellipsis (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4279 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4280 {
27106
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4281 if (it->selective_display_ellipsis_p)
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4282 {
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4283 if (it->dp && VECTORP (DISP_INVIS_VECTOR (it->dp)))
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4284 {
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4285 /* Use the display table definition for `...'. Invalid glyphs
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4286 will be handled by the method returning elements from dpvec. */
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4287 struct Lisp_Vector *v = XVECTOR (DISP_INVIS_VECTOR (it->dp));
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4288 it->dpvec_char_len = it->len;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4289 it->dpvec = v->contents;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4290 it->dpend = v->contents + v->size;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4291 it->current.dpvec_index = 0;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4292 it->method = next_element_from_display_vector;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4293 }
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4294 else
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4295 {
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4296 /* Use default `...' which is stored in default_invis_vector. */
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4297 it->dpvec_char_len = it->len;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4298 it->dpvec = default_invis_vector;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4299 it->dpend = default_invis_vector + 3;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4300 it->current.dpvec_index = 0;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4301 it->method = next_element_from_display_vector;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4302 }
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4303 }
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4304 else
32585
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
4305 {
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
4306 it->method = next_element_from_buffer;
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
4307 reseat_at_next_visible_line_start (it, 1);
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
4308 }
27106
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4309
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4310 return get_next_display_element (it);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4311 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4314 /* Deliver an image display element. The iterator IT is already
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4315 filled with image information (done in handle_display_prop). Value
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4316 is always 1. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4317
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 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4320 next_element_from_image (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4321 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4322 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4323 it->what = IT_IMAGE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4324 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4325 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4326
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4327
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4328 /* Fill iterator IT with next display element from a stretch glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4329 property. IT->object is the value of the text property. Value is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4330 always 1. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4331
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4332 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4333 next_element_from_stretch (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4334 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4335 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4336 it->what = IT_STRETCH;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4337 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4338 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4339
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 /* Load IT with the next display element from current_buffer. Value
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4342 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
4343 position at which to stop and check for text properties or buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4344 end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4345
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4346 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4347 next_element_from_buffer (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4348 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4349 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4350 int success_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4351
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4352 /* Check this assumption, otherwise, we would never enter the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4353 if-statement, below. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4354 xassert (IT_CHARPOS (*it) >= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4355 && IT_CHARPOS (*it) <= it->stop_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4356
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4357 if (IT_CHARPOS (*it) >= it->stop_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4358 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4359 if (IT_CHARPOS (*it) >= it->end_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4360 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4361 int overlay_strings_follow_p;
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 /* End of the game, except when overlay strings follow that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4364 haven't been returned yet. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4365 if (it->overlay_strings_at_end_processed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4366 overlay_strings_follow_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4367 else
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 it->overlay_strings_at_end_processed_p = 1;
27056
8cf3702104b5 (next_element_from_buffer): Change assertion at the end
Gerd Moellmann <gerd@gnu.org>
parents: 27015
diff changeset
4370 overlay_strings_follow_p = get_overlay_strings (it);
25012
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 if (overlay_strings_follow_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4374 success_p = get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4375 else
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 it->what = IT_EOB;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4378 it->position = it->current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4379 success_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4380 }
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4383 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4384 handle_stop (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4385 return get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4386 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4387 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4388 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4389 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4390 /* No face changes, overlays etc. in sight, so just return a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4391 character from current_buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4392 unsigned char *p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4393
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4394 /* Maybe run the redisplay end trigger hook. Performance note:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4395 This doesn't seem to cost measurable time. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4396 if (it->redisplay_end_trigger_charpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4397 && it->glyph_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4398 && IT_CHARPOS (*it) >= it->redisplay_end_trigger_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4399 run_redisplay_end_trigger_hook (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4400
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4401 /* Get the next character, maybe multibyte. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4402 p = BYTE_POS_ADDR (IT_BYTEPOS (*it));
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4403 if (it->multibyte_p && !ASCII_BYTE_P (*p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4404 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4405 int maxlen = ((IT_BYTEPOS (*it) >= GPT_BYTE ? ZV_BYTE : GPT_BYTE)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4406 - IT_BYTEPOS (*it));
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
4407 it->c = string_char_and_length (p, maxlen, &it->len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4408 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4409 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4410 it->c = *p, it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4411
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4412 /* Record what we have and where it came from. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4413 it->what = IT_CHARACTER;;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4414 it->object = it->w->buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4415 it->position = it->current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4416
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4417 /* Normally we return the character found above, except when we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4418 really want to return an ellipsis for selective display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4419 if (it->selective)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4420 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4421 if (it->c == '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4422 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4423 /* A value of selective > 0 means hide lines indented more
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4424 than that number of columns. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4425 if (it->selective > 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4426 && IT_CHARPOS (*it) + 1 < ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4427 && indented_beyond_p (IT_CHARPOS (*it) + 1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4428 IT_BYTEPOS (*it) + 1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4429 it->selective))
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
4430 {
27106
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4431 success_p = 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
4432 it->dpvec_char_len = -1;
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
4433 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4434 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4435 else if (it->c == '\r' && it->selective == -1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4436 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4437 /* A value of selective == -1 means that everything from the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4438 CR to the end of the line is invisible, with maybe an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4439 ellipsis displayed for it. */
27106
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4440 success_p = 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
4441 it->dpvec_char_len = -1;
25012
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4444 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4445
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4446 /* Value is zero if end of buffer reached. */
27056
8cf3702104b5 (next_element_from_buffer): Change assertion at the end
Gerd Moellmann <gerd@gnu.org>
parents: 27015
diff changeset
4447 xassert (!success_p || it->what != IT_CHARACTER || it->len > 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4448 return success_p;
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
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 /* Run the redisplay end trigger hook for IT. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4455 run_redisplay_end_trigger_hook (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4456 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4457 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4458 Lisp_Object args[3];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4459
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4460 /* 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
4461 displaying something, or otherwise we should not run the hook. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4462 xassert (it->glyph_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4463
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4464 /* Set up hook arguments. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4465 args[0] = Qredisplay_end_trigger_functions;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4466 args[1] = it->window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4467 XSETINT (args[2], it->redisplay_end_trigger_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4468 it->redisplay_end_trigger_charpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4469
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4470 /* 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
4471 them again, even if they get an error. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4472 it->w->redisplay_end_trigger = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4473 Frun_hook_with_args (3, args);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4474
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4475 /* Notice if it changed the face of the character we are on. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4476 handle_face_prop (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4477 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4478
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4479
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4480 /* Deliver a composition display element. The iterator IT is already
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4481 filled with composition information (done in
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4482 handle_composition_prop). Value is always 1. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4483
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4484 static int
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4485 next_element_from_composition (it)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4486 struct it *it;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4487 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4488 it->what = IT_COMPOSITION;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4489 it->position = (STRINGP (it->string)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4490 ? it->current.string_pos
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4491 : it->current.pos);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4492 return 1;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4493 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4494
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4495
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4496
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 Moving an iterator without producing glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4499 ***********************************************************************/
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 /* Move iterator IT to a specified buffer or X position within one
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4502 line on the display without producing glyphs.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4503
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4504 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
4505 whichever is reached first.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4506
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4507 TO_CHARPOS <= 0 means no TO_CHARPOS is specified.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4508
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4509 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
4510 0 <= TO_X <= IT->last_visible_x. This means in particular, that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4511 TO_X includes the amount by which a window is horizontally
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4512 scrolled.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4513
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4514 Value is
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 MOVE_POS_MATCH_OR_ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4517 - when TO_POS or ZV was reached.
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 MOVE_X_REACHED
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4520 -when TO_X was reached before TO_POS or ZV were reached.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4521
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4522 MOVE_LINE_CONTINUED
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4523 - 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
4524 be continued.
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 MOVE_LINE_TRUNCATED
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4527 - 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
4528 truncated.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4529
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4530 MOVE_NEWLINE_OR_CR
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4531 - 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
4532 display is on. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4533
25693
b12ed057020a (move_it_in_display_line_to): Make type consistent with declaration.
Dave Love <fx@gnu.org>
parents: 25677
diff changeset
4534 static enum move_it_result
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4535 move_it_in_display_line_to (it, to_charpos, to_x, op)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4536 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4537 int to_charpos, to_x, op;
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 enum move_it_result result = MOVE_UNDEFINED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4540 struct glyph_row *saved_glyph_row;
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 /* Don't produce glyphs in produce_glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4543 saved_glyph_row = it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4544 it->glyph_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4545
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4546 while (1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4547 {
31506
a1d733428491 (dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents: 31493
diff changeset
4548 int x, i, ascent = 0, descent = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4549
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4550 /* Stop when ZV or TO_CHARPOS reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4551 if (!get_next_display_element (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4552 || ((op & MOVE_TO_POS) != 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4553 && BUFFERP (it->object)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4554 && IT_CHARPOS (*it) >= to_charpos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4555 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4556 result = MOVE_POS_MATCH_OR_ZV;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4557 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4558 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4559
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4560 /* The call to produce_glyphs will get the metrics of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4561 display element IT is loaded with. We record in x the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4562 x-position before this display element in case it does not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4563 fit on the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4564 x = it->current_x;
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4565
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4566 /* Remember the line height so far in case the next element doesn't
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4567 fit on the line. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4568 if (!it->truncate_lines_p)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4569 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4570 ascent = it->max_ascent;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4571 descent = it->max_descent;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4572 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4573
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4574 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4575
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4576 if (it->area != TEXT_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4577 {
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
4578 set_iterator_to_next (it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4579 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4580 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4581
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4582 /* The number of glyphs we get back in IT->nglyphs will normally
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4583 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
4584 character on a terminal frame, or (iii) a line end. For the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4585 second case, IT->nglyphs - 1 padding glyphs will be present
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4586 (on X frames, there is only one glyph produced for a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4587 composite character.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4588
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4589 The behavior implemented below means, for continuation lines,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4590 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
4591 displayed there. For terminal frames, as many glyphs of a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4592 multi-glyph character are displayed in the current line, too.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4593 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
4594 way. Under X, the whole shape of a complex character must
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4595 fit on the line or it will be completely displayed in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4596 next line.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4597
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4598 Note that both for tabs and padding glyphs, all glyphs have
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4599 the same width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4600 if (it->nglyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4601 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4602 /* More than one glyph or glyph doesn't fit on line. All
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4603 glyphs have the same width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4604 int single_glyph_width = it->pixel_width / it->nglyphs;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4605 int new_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4606
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4607 for (i = 0; i < it->nglyphs; ++i, x = new_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4608 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4609 new_x = x + single_glyph_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4610
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4611 /* We want to leave anything reaching TO_X to the caller. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4612 if ((op & MOVE_TO_X) && new_x > to_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4613 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4614 it->current_x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4615 result = MOVE_X_REACHED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4616 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4617 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4618 else if (/* Lines are continued. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4619 !it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4620 && (/* And glyph doesn't fit on the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4621 new_x > it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4622 /* Or it fits exactly and we're on a window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4623 system frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4624 || (new_x == it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4625 && FRAME_WINDOW_P (it->f))))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4626 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4627 if (/* IT->hpos == 0 means the very first glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4628 doesn't fit on the line, e.g. a wide image. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4629 it->hpos == 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4630 || (new_x == it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4631 && FRAME_WINDOW_P (it->f)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4632 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4633 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4634 it->current_x = new_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4635 if (i == it->nglyphs - 1)
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
4636 set_iterator_to_next (it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4637 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4638 else
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4639 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4640 it->current_x = x;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4641 it->max_ascent = ascent;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4642 it->max_descent = descent;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4643 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4644
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4645 TRACE_MOVE ((stderr, "move_it_in: continued at %d\n",
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4646 IT_CHARPOS (*it)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4647 result = MOVE_LINE_CONTINUED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4648 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4649 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4650 else if (new_x > it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4651 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4652 /* Glyph is visible. Increment number of glyphs that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4653 would be displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4654 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4655 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4656 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4657 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4658 /* Glyph is completely off the left margin of the display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4659 area. Nothing to do. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4660 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4661 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4662
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4663 if (result != MOVE_UNDEFINED)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4664 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4665 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4666 else if ((op & MOVE_TO_X) && it->current_x >= to_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4667 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4668 /* Stop when TO_X specified and reached. This check is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4669 necessary here because of lines consisting of a line end,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4670 only. The line end will not produce any glyphs and we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4671 would never get MOVE_X_REACHED. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4672 xassert (it->nglyphs == 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4673 result = MOVE_X_REACHED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4674 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4675 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4676
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4677 /* Is this a line end? If yes, we're done. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4678 if (ITERATOR_AT_END_OF_LINE_P (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4679 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4680 result = MOVE_NEWLINE_OR_CR;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4681 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4682 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4683
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4684 /* The current display element has been consumed. Advance
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4685 to the next. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
4686 set_iterator_to_next (it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4687
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4688 /* Stop if lines are truncated and IT's current x-position is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4689 past the right edge of the window now. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4690 if (it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4691 && it->current_x >= it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4692 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4693 result = MOVE_LINE_TRUNCATED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4694 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4695 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4696 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4697
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4698 /* Restore the iterator settings altered at the beginning of this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4699 function. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4700 it->glyph_row = saved_glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4701 return result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4702 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4703
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4704
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4705 /* Move IT forward to a specified buffer position TO_CHARPOS, TO_X,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4706 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
4707 the description of enum move_operation_enum.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4708
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4709 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
4710 screen line, this function will set IT to the next position >
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4711 TO_CHARPOS. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4712
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4713 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4714 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
4715 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4716 int to_charpos, to_x, to_y, to_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4717 int op;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4718 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4719 enum move_it_result skip, skip2 = MOVE_X_REACHED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4720 int line_height;
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4721 int reached = 0;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4722
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4723 for (;;)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4724 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4725 if (op & MOVE_TO_VPOS)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4726 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4727 /* If no TO_CHARPOS and no TO_X specified, stop at the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4728 start of the line TO_VPOS. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4729 if ((op & (MOVE_TO_X | MOVE_TO_POS)) == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4730 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4731 if (it->vpos == to_vpos)
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4732 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4733 reached = 1;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4734 break;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4735 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4736 else
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4737 skip = move_it_in_display_line_to (it, -1, -1, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4738 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4739 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4740 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4741 /* TO_VPOS >= 0 means stop at TO_X in the line at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4742 TO_VPOS, or at TO_POS, whichever comes first. */
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4743 if (it->vpos == to_vpos)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4744 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4745 reached = 2;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4746 break;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4747 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4748
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4749 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
4750
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4751 if (skip == MOVE_POS_MATCH_OR_ZV || it->vpos == to_vpos)
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4752 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4753 reached = 3;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4754 break;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4755 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4756 else if (skip == MOVE_X_REACHED && it->vpos != to_vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4757 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4758 /* We have reached TO_X but not in the line we want. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4759 skip = move_it_in_display_line_to (it, to_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4760 -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4761 if (skip == MOVE_POS_MATCH_OR_ZV)
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4762 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4763 reached = 4;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4764 break;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4765 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4766 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4767 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4768 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4769 else if (op & MOVE_TO_Y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4770 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4771 struct it it_backup;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4772
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4773 /* TO_Y specified means stop at TO_X in the line containing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4774 TO_Y---or at TO_CHARPOS if this is reached first. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4775 problem is that we can't really tell whether the line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4776 contains TO_Y before we have completely scanned it, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4777 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
4778 TO_X.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4779
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4780 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
4781 is to make the outcome of this function more predictable.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4782 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
4783 the line which is probably not what a caller would expect
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4784 to happen. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4785 skip = move_it_in_display_line_to (it, to_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4786 ((op & MOVE_TO_X)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4787 ? to_x : 0),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4788 (MOVE_TO_X
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4789 | (op & MOVE_TO_POS)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4790
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4791 /* 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
4792 if (skip == MOVE_POS_MATCH_OR_ZV)
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4793 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4794 reached = 5;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4795 break;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4796 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4797
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4798 /* 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
4799 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
4800 total line height which requires us to scan the rest of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4801 the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4802 if (skip == MOVE_X_REACHED)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4803 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4804 it_backup = *it;
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4805 TRACE_MOVE ((stderr, "move_it: from %d\n", IT_CHARPOS (*it)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4806 skip2 = move_it_in_display_line_to (it, to_charpos, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4807 op & MOVE_TO_POS);
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4808 TRACE_MOVE ((stderr, "move_it: to %d\n", IT_CHARPOS (*it)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4809 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4810
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4811 /* Now, decide whether TO_Y is in this line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4812 line_height = it->max_ascent + it->max_descent;
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4813 TRACE_MOVE ((stderr, "move_it: line_height = %d\n", line_height));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4814
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4815 if (to_y >= it->current_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4816 && to_y < it->current_y + line_height)
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 if (skip == MOVE_X_REACHED)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4819 /* 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
4820 we scanned too far. We have to restore IT's settings
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4821 to the ones before skipping. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4822 *it = it_backup;
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4823 reached = 6;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4824 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4825 else if (skip == MOVE_X_REACHED)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4826 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4827 skip = skip2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4828 if (skip == MOVE_POS_MATCH_OR_ZV)
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4829 reached = 7;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4830 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4831
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4832 if (reached)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4833 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4834 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4835 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4836 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
4837
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4838 switch (skip)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4839 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4840 case MOVE_POS_MATCH_OR_ZV:
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4841 reached = 8;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4842 goto out;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4843
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4844 case MOVE_NEWLINE_OR_CR:
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
4845 set_iterator_to_next (it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4846 it->continuation_lines_width = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4847 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4848
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4849 case MOVE_LINE_TRUNCATED:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4850 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
4851 reseat_at_next_visible_line_start (it, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4852 if ((op & MOVE_TO_POS) != 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4853 && IT_CHARPOS (*it) > to_charpos)
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4854 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4855 reached = 9;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4856 goto out;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4857 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4858 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4859
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4860 case MOVE_LINE_CONTINUED:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4861 it->continuation_lines_width += it->current_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4862 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4863
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4864 default:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4865 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4866 }
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 /* Reset/increment for the next run. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4869 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4870 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4871 it->current_y += it->max_ascent + it->max_descent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4872 ++it->vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4873 last_height = it->max_ascent + it->max_descent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4874 last_max_ascent = it->max_ascent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4875 it->max_ascent = it->max_descent = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4876 }
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4877
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4878 out:
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4879
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4880 TRACE_MOVE ((stderr, "move_it_to: reached %d\n", reached));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4881 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4882
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4883
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4884 /* Move iterator IT backward by a specified y-distance DY, DY >= 0.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4885
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4886 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
4887 means move IT backward to the preceding line start or BEGV. This
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4888 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
4889 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
4890 set to the top of the line moved to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4891
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4892 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4893 move_it_vertically_backward (it, dy)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4894 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4895 int dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4896 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4897 int nlines, h, line_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4898 struct it it2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4899 int start_pos = IT_CHARPOS (*it);
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 xassert (dy >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4902
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4903 /* Estimate how many newlines we must move back. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4904 nlines = max (1, dy / CANON_Y_UNIT (it->f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4905
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4906 /* Set the iterator's position that many lines back. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4907 while (nlines-- && IT_CHARPOS (*it) > BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4908 back_to_previous_visible_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4909
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4910 /* Reseat the iterator here. When moving backward, we don't want
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4911 reseat to skip forward over invisible text, set up the iterator
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4912 to deliver from overlay strings at the new position etc. So,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4913 use reseat_1 here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4914 reseat_1 (it, it->current.pos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4915
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4916 /* We are now surely at a line start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4917 it->current_x = it->hpos = 0;
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 /* 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
4920 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
4921 height to be able to tell whether we reached the specified
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4922 y-distance. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4923 it2 = *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4924 it2.max_ascent = it2.max_descent = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4925 move_it_to (&it2, start_pos, -1, -1, it2.vpos + 1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4926 MOVE_TO_POS | MOVE_TO_VPOS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4927 xassert (IT_CHARPOS (*it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4928 line_height = it2.max_ascent + it2.max_descent;
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4929
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4930 move_it_to (&it2, start_pos, -1, -1, -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4931 xassert (IT_CHARPOS (*it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4932 h = it2.current_y - it->current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4933 nlines = it2.vpos - it->vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4934
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4935 /* Correct IT's y and vpos position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4936 it->vpos -= nlines;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4937 it->current_y -= h;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4938
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4939 if (dy == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4940 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4941 /* DY == 0 means move to the start of the screen line. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4942 value of nlines is > 0 if continuation lines were involved. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4943 if (nlines > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4944 move_it_by_lines (it, nlines, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4945 xassert (IT_CHARPOS (*it) <= start_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4946 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4947 else if (nlines)
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 /* The y-position we try to reach. Note that h has been
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4950 subtracted in front of the if-statement. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4951 int target_y = it->current_y + h - dy;
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 /* 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
4954 we can. If we moved too far backward, try to move forward. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4955 if (target_y < it->current_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4956 && IT_CHARPOS (*it) > BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4957 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4958 move_it_vertically (it, target_y - it->current_y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4959 xassert (IT_CHARPOS (*it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4960 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4961 else if (target_y >= it->current_y + line_height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4962 && IT_CHARPOS (*it) < ZV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4963 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4964 move_it_vertically (it, target_y - (it->current_y + line_height));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4965 xassert (IT_CHARPOS (*it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4966 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4967 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4968 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4971 /* 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
4972 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
4973 end, IT will be on the start of a screen line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4974
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4975 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4976 move_it_vertically (it, dy)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4977 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4978 int dy;
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 if (dy <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4981 move_it_vertically_backward (it, -dy);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4982 else if (dy > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4983 {
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4984 TRACE_MOVE ((stderr, "move_it_v: from %d, %d\n", IT_CHARPOS (*it), dy));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4985 move_it_to (it, ZV, -1, it->current_y + dy, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4986 MOVE_TO_POS | MOVE_TO_Y);
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4987 TRACE_MOVE ((stderr, "move_it_v: to %d\n", IT_CHARPOS (*it)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4988
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4989 /* 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
4990 the line to satisfy the post-condition. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4991 if (IT_CHARPOS (*it) == ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4992 && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4993 move_it_by_lines (it, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4994 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4995 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4996
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 /* Return non-zero if some text between buffer positions START_CHARPOS
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4999 and END_CHARPOS is invisible. IT->window is the window for text
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5000 property lookup. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5001
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5002 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5003 invisible_text_between_p (it, start_charpos, end_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5004 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5005 int start_charpos, end_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5006 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5007 Lisp_Object prop, limit;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5008 int invisible_found_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5009
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5010 xassert (it != NULL && start_charpos <= end_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5011
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5012 /* Is text at START invisible? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5013 prop = Fget_char_property (make_number (start_charpos), Qinvisible,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5014 it->window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5015 if (TEXT_PROP_MEANS_INVISIBLE (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5016 invisible_found_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5017 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5018 {
30243
c56062542bae (display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents: 30216
diff changeset
5019 limit = Fnext_single_char_property_change (make_number (start_charpos),
c56062542bae (display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents: 30216
diff changeset
5020 Qinvisible, Qnil,
c56062542bae (display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents: 30216
diff changeset
5021 make_number (end_charpos));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5022 invisible_found_p = XFASTINT (limit) < end_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5023 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5024
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5025 return invisible_found_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5026 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5027
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5028
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5029 /* Move IT by a specified number DVPOS of screen lines down. DVPOS
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5030 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
5031 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
5032 NEED_Y_P is zero, IT->current_y will be left unchanged.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5033
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5034 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
5035 a face with proportional font, we could be faster for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5036 truncate-lines nil. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5037
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5038 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5039 move_it_by_lines (it, dvpos, need_y_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5040 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5041 int dvpos, need_y_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5042 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5043 struct position pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5044
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5045 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5046 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5047 struct text_pos textpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5048
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5049 /* We can use vmotion on frames without proportional fonts. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5050 pos = *vmotion (IT_CHARPOS (*it), dvpos, it->w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5051 SET_TEXT_POS (textpos, pos.bufpos, pos.bytepos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5052 reseat (it, textpos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5053 it->vpos += pos.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5054 it->current_y += pos.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5055 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5056 else if (dvpos == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5057 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5058 /* DVPOS == 0 means move to the start of the screen line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5059 move_it_vertically_backward (it, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5060 xassert (it->current_x == 0 && it->hpos == 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5061 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5062 else if (dvpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5063 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5064 /* If there are no continuation lines, and if there is no
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5065 selective display, try the simple method of moving forward
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5066 DVPOS newlines, then see where we are. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5067 if (!need_y_p && it->truncate_lines_p && it->selective == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5068 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5069 int shortage = 0, charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5070
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5071 if (FETCH_BYTE (IT_BYTEPOS (*it) == '\n'))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5072 charpos = IT_CHARPOS (*it) + 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5073 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5074 charpos = scan_buffer ('\n', IT_CHARPOS (*it), 0, dvpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5075 &shortage, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5076
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5077 if (!invisible_text_between_p (it, IT_CHARPOS (*it), charpos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5078 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5079 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5080 CHARPOS (pos) = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5081 BYTEPOS (pos) = CHAR_TO_BYTE (charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5082 reseat (it, pos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5083 it->vpos += dvpos - shortage;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5084 it->hpos = it->current_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5085 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5086 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5087 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5088
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5089 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
5090 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5091 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5092 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5093 struct it it2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5094 int start_charpos, i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5095
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5096 /* If there are no continuation lines, and if there is no
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5097 selective display, try the simple method of moving backward
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5098 -DVPOS newlines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5099 if (!need_y_p && it->truncate_lines_p && it->selective == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5100 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5101 int shortage;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5102 int charpos = IT_CHARPOS (*it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5103 int bytepos = IT_BYTEPOS (*it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5104
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5105 /* If in the middle of a line, go to its start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5106 if (charpos > BEGV && FETCH_BYTE (bytepos - 1) != '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5107 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5108 charpos = find_next_newline_no_quit (charpos, -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5109 bytepos = CHAR_TO_BYTE (charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5110 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5111
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5112 if (charpos == BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5113 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5114 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5115 CHARPOS (pos) = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5116 BYTEPOS (pos) = bytepos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5117 reseat (it, pos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5118 it->hpos = it->current_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5119 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5120 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5121 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5122 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5123 charpos = scan_buffer ('\n', charpos - 1, 0, dvpos, &shortage, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5124 if (!invisible_text_between_p (it, charpos, IT_CHARPOS (*it)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5125 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5126 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5127 CHARPOS (pos) = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5128 BYTEPOS (pos) = CHAR_TO_BYTE (charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5129 reseat (it, pos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5130 it->vpos += dvpos + (shortage ? shortage - 1 : 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5131 it->hpos = it->current_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5132 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5133 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5134 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5135 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5136
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5137 /* Go back -DVPOS visible lines and reseat the iterator there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5138 start_charpos = IT_CHARPOS (*it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5139 for (i = -dvpos; i && IT_CHARPOS (*it) > BEGV; --i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5140 back_to_previous_visible_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5141 reseat (it, it->current.pos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5142 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5143
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5144 /* Above call may have moved too far if continuation lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5145 are involved. Scan forward and see if it did. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5146 it2 = *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5147 it2.vpos = it2.current_y = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5148 move_it_to (&it2, start_charpos, -1, -1, -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5149 it->vpos -= it2.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5150 it->current_y -= it2.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5151 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5152
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5153 /* If we moved too far, move IT some lines forward. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5154 if (it2.vpos > -dvpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5155 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5156 int delta = it2.vpos + dvpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5157 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
5158 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5159 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5160 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5161
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5162
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5163
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5164 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5165 Messages
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5166 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5167
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5168
25798
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5169 /* 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
5170 to *Messages*. */
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5171
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5172 void
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5173 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
5174 char *format;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5175 Lisp_Object arg1, arg2;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5176 {
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5177 Lisp_Object args[3];
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5178 Lisp_Object msg, fmt;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5179 char *buffer;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5180 int len;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5181 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
5182
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5183 fmt = msg = Qnil;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5184 GCPRO4 (fmt, msg, arg1, arg2);
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5185
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5186 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
5187 args[1] = arg1;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5188 args[2] = arg2;
28464
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
5189 msg = Fformat (3, args);
25798
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5190
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5191 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
5192 buffer = (char *) alloca (len);
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5193 strcpy (buffer, XSTRING (msg)->data);
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5194
28876
04cbb0510d7e (add_to_log): Pass 1 byte less to message_dolog.
Gerd Moellmann <gerd@gnu.org>
parents: 28869
diff changeset
5195 message_dolog (buffer, len - 1, 1, 0);
25798
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5196 UNGCPRO;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5197 }
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5198
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5199
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
5200 /* Output a newline in the *Messages* buffer if "needs" one. */
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
5201
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
5202 void
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
5203 message_log_maybe_newline ()
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
5204 {
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
5205 if (message_log_need_newline)
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5206 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
5207 }
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
5208
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
5209
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5210 /* Add a string M of length LEN to the message log, optionally
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5211 terminated with a newline when NLFLAG is non-zero. MULTIBYTE, if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5212 nonzero, means interpret the contents of M as multibyte. This
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5213 function calls low-level routines in order to bypass text property
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5214 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
5215
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5216 void
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5217 message_dolog (m, len, nlflag, multibyte)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5218 char *m;
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5219 int len, nlflag, multibyte;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5220 {
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5221 if (!NILP (Vmessage_log_max))
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5222 {
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5223 struct buffer *oldbuf;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5224 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
5225 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
5226 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
5227 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
5228 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
5229 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
5230
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
5231 old_deactivate_mark = Vdeactivate_mark;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5232 oldbuf = current_buffer;
30728
a87e28789082 (Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30721
diff changeset
5233 Fset_buffer (Fget_buffer_create (Vmessages_buffer_name));
11531
355c40d2b1d2 (message_dolog): The message log doesn't need an undo list.
Karl Heuer <kwzh@gnu.org>
parents: 11499
diff changeset
5234 current_buffer->undo_list = Qt;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5235
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5236 oldpoint = Fpoint_marker ();
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5237 oldbegv = Fpoint_min_marker ();
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5238 oldzv = Fpoint_max_marker ();
22500
274456e421ab (message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents: 22399
diff changeset
5239 GCPRO4 (oldpoint, oldbegv, oldzv, old_deactivate_mark);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5240
20703
f465da76f36b (message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 20689
diff changeset
5241 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
5242 point_at_end = 1;
20703
f465da76f36b (message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 20689
diff changeset
5243 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
5244 zv_at_end = 1;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5245
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5246 BEGV = BEG;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5247 BEGV_BYTE = BEG_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5248 ZV = Z;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5249 ZV_BYTE = Z_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5250 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
5251
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
5252 /* 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
5253 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
5254 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
5255 && 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
5256 {
24040
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
5257 int i, c, nbytes;
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
5258 unsigned char work[1];
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5259
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
5260 /* 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
5261 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
5262 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
5263 {
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
5264 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
5265 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
5266 ? c
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
5267 : 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
5268 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
5269 }
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
5270 }
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5271 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
5272 && ! 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
5273 {
24040
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
5274 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
5275 unsigned char *msg = (unsigned char *) m;
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
5276 unsigned char str[MAX_MULTIBYTE_LENGTH];
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
5277 /* 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
5278 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
5279 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
5280 {
24040
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
5281 c = unibyte_char_to_multibyte (msg[i]);
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
5282 nbytes = CHAR_STRING (c, str);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
5283 insert_1_both (str, 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
5284 }
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
5285 }
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
5286 else if (len)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5287 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
5288
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5289 if (nlflag)
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5290 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5291 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
5292 insert_1 ("\n", 1, 1, 0, 0);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5293
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5294 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
5295 this_bol = PT;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5296 this_bol_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5297
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5298 if (this_bol > BEG)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5299 {
20703
f465da76f36b (message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 20689
diff changeset
5300 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
5301 prev_bol = PT;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5302 prev_bol_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5303
20964
4cad33afd914 (message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents: 20926
diff changeset
5304 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
5305 this_bol, this_bol_byte);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5306 if (dup)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5307 {
20981
0ce30e7ba2b8 Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents: 20964
diff changeset
5308 del_range_both (prev_bol, prev_bol_byte,
0ce30e7ba2b8 Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents: 20964
diff changeset
5309 this_bol, this_bol_byte, 0);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5310 if (dup > 1)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5311 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5312 char dupstr[40];
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5313 int duplen;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5314
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5315 /* 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
5316 change message_log_check_duplicate. */
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5317 sprintf (dupstr, " [%d times]", dup);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5318 duplen = strlen (dupstr);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5319 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
5320 insert_1 (dupstr, duplen, 1, 0, 1);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5321 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5322 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5323 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5324
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5325 if (NATNUMP (Vmessage_log_max))
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5326 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5327 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5328 -XFASTINT (Vmessage_log_max) - 1, 0);
20981
0ce30e7ba2b8 Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents: 20964
diff changeset
5329 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
5330 }
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5331 }
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5332 BEGV = XMARKER (oldbegv)->charpos;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5333 BEGV_BYTE = marker_byte_position (oldbegv);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5334
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
5335 if (zv_at_end)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5336 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5337 ZV = Z;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5338 ZV_BYTE = Z_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5339 }
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
5340 else
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5341 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5342 ZV = XMARKER (oldzv)->charpos;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5343 ZV_BYTE = marker_byte_position (oldzv);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5344 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5345
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
5346 if (point_at_end)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5347 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
5348 else
24040
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
5349 /* 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
5350 Lisp code. */
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
5351 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
5352 XMARKER (oldpoint)->bytepos);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5353
22500
274456e421ab (message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents: 22399
diff changeset
5354 UNGCPRO;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5355 free_marker (oldpoint);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5356 free_marker (oldbegv);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5357 free_marker (oldzv);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5358
22209
571020b7fc5e (message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents: 22148
diff changeset
5359 tem = Fget_buffer_window (Fcurrent_buffer (), Qt);
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5360 set_buffer_internal (oldbuf);
22209
571020b7fc5e (message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents: 22148
diff changeset
5361 if (NILP (tem))
571020b7fc5e (message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents: 22148
diff changeset
5362 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
5363 message_log_need_newline = !nlflag;
21179
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
5364 Vdeactivate_mark = old_deactivate_mark;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5365 }
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5366 }
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5367
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5368
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5369 /* 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
5370 (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
5371 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
5372 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
5373 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
5374
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5375 static int
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5376 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
5377 int prev_bol, this_bol;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5378 int prev_bol_byte, this_bol_byte;
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5379 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5380 int i;
23257
b72cefab3254 (message_log_check_duplicate): Count byte length of the
Kenichi Handa <handa@m17n.org>
parents: 23249
diff changeset
5381 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
5382 int seen_dots = 0;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5383 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
5384 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
5385
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5386 for (i = 0; i < len; i++)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5387 {
33594
a4cd4c93196b (message_log_check_duplicate): Let "..."-detection match
Miles Bader <miles@gnu.org>
parents: 33591
diff changeset
5388 if (i >= 3 && p1[i-3] == '.' && p1[i-2] == '.' && p1[i-1] == '.')
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5389 seen_dots = 1;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5390 if (p1[i] != p2[i])
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5391 return seen_dots;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5392 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5393 p1 += len;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5394 if (*p1 == '\n')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5395 return 2;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5396 if (*p1++ == ' ' && *p1++ == '[')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5397 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5398 int n = 0;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5399 while (*p1 >= '0' && *p1 <= '9')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5400 n = n * 10 + *p1++ - '0';
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5401 if (strncmp (p1, " times]\n", 8) == 0)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5402 return n+1;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5403 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5404 return 0;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5405 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5406
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5407
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5408 /* Display an echo area message M with a specified length of LEN
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5409 chars. The string may include null characters. If M is 0, clear
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5410 out any existing message, and let the mini-buffer text show through.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5411
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5412 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
5413 cleared or some other message gets displayed there. This means do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5414 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
5415 a buffer that was alloca'd. */
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5417 void
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5418 message2 (m, len, multibyte)
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5419 char *m;
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5420 int len;
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5421 int multibyte;
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5422 {
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5423 /* 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
5424 message_log_maybe_newline ();
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5425 if (m)
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5426 message_dolog (m, len, 1, multibyte);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5427 message2_nolog (m, len, multibyte);
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5428 }
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5429
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5430
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
5431 /* The non-logging counterpart of message2. */
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5432
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5433 void
20494
9946c5fb4ff7 (message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20473
diff changeset
5434 message2_nolog (m, len, multibyte)
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5435 char *m;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5436 int len;
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5437 {
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5438 struct frame *sf = SELECTED_FRAME ();
20494
9946c5fb4ff7 (message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20473
diff changeset
5439 message_enable_multibyte = multibyte;
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
5440
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5441 if (noninteractive)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5442 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5443 if (noninteractive_need_newline)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5444 putc ('\n', stderr);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5445 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
5446 if (m)
8fce2f503ea9 (message2_nolog): Don't call fwrite will null string.
Richard M. Stallman <rms@gnu.org>
parents: 18730
diff changeset
5447 fwrite (m, len, 1, stderr);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5448 if (cursor_in_echo_area == 0)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5449 fprintf (stderr, "\n");
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5450 fflush (stderr);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5451 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5452 /* 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
5453 initialized yet. Error messages get reported properly by
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5454 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
5455 else if (INTERACTIVE
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5456 && sf->glyphs_initialized_p
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5457 && FRAME_MESSAGE_BUF (sf))
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5458 {
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5459 Lisp_Object mini_window;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5460 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5461
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5462 /* 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
5463 that the selected frame is using. */
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5464 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
5465 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
5466
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5467 FRAME_SAMPLE_VISIBILITY (f);
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5468 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
5469 && ! FRAME_VISIBLE_P (f))
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5470 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
5471
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5472 if (m)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5473 {
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5474 set_message (m, Qnil, len, multibyte);
16660
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
5475 if (minibuffer_auto_raise)
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
5476 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window)));
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5477 }
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
5478 else
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5479 clear_message (1, 1);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5480
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5481 do_pending_window_change (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5482 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
5483 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
5484 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
5485 (*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
5486 }
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
5487 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5488
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5489
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5490 /* 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
5491 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
5492 string, clear out any existing message, and let the mini-buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5493 text show through. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5494
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5495 void
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5496 message3 (m, nbytes, multibyte)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5497 Lisp_Object m;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5498 int nbytes;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5499 int multibyte;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5500 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5501 struct gcpro gcpro1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5502
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5503 GCPRO1 (m);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5504
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5505 /* First flush out any partial line written with print. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5506 message_log_maybe_newline ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5507 if (STRINGP (m))
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5508 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
5509 message3_nolog (m, nbytes, multibyte);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5510
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5511 UNGCPRO;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5512 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5513
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5514
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5515 /* The non-logging version of message3. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5516
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5517 void
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5518 message3_nolog (m, nbytes, multibyte)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5519 Lisp_Object m;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5520 int nbytes, multibyte;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5521 {
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5522 struct frame *sf = SELECTED_FRAME ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5523 message_enable_multibyte = multibyte;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5524
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5525 if (noninteractive)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5526 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5527 if (noninteractive_need_newline)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5528 putc ('\n', stderr);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5529 noninteractive_need_newline = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5530 if (STRINGP (m))
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5531 fwrite (XSTRING (m)->data, nbytes, 1, stderr);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5532 if (cursor_in_echo_area == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5533 fprintf (stderr, "\n");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5534 fflush (stderr);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5535 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5536 /* A null message buffer means that the frame hasn't really been
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5537 initialized yet. Error messages get reported properly by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5538 cmd_error, so this must be just an informative message; toss it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5539 else if (INTERACTIVE
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5540 && sf->glyphs_initialized_p
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5541 && FRAME_MESSAGE_BUF (sf))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5542 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5543 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
5544 Lisp_Object frame;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5545 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5546
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5547 /* Get the frame containing the mini-buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5548 that the selected frame is using. */
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5549 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
5550 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
5551 f = XFRAME (frame);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5552
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5553 FRAME_SAMPLE_VISIBILITY (f);
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5554 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
5555 && !FRAME_VISIBLE_P (f))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5556 Fmake_frame_visible (frame);
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 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
5559 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5560 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
5561 if (minibuffer_auto_raise)
9aff86718a20 (try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents: 25388
diff changeset
5562 Fraise_frame (frame);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5563 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5564 else
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5565 clear_message (1, 1);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5566
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5567 do_pending_window_change (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5568 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
5569 do_pending_window_change (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5570 if (frame_up_to_date_hook != 0 && ! gc_in_progress)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5571 (*frame_up_to_date_hook) (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5572 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5573 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5574
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5575
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5576 /* 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
5577 out any existing message, and let the mini-buffer text show through.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5578
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5579 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
5580 cleared or some other message gets displayed there. Do not pass
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5581 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
5582 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
5583
6366
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
5584 void
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
5585 message1 (m)
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
5586 char *m;
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
5587 {
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5588 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
5589 }
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
5590
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5591
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5592 /* The non-logging counterpart of message1. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5593
10394
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5594 void
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5595 message1_nolog (m)
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5596 char *m;
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5597 {
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5598 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
5599 }
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5600
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5601 /* 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
5602 which gets replaced with STRING. */
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5603
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5604 void
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5605 message_with_string (m, string, log)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5606 char *m;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5607 Lisp_Object string;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5608 int log;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5609 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5610 if (noninteractive)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5611 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5612 if (m)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5613 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5614 if (noninteractive_need_newline)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5615 putc ('\n', stderr);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5616 noninteractive_need_newline = 0;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5617 fprintf (stderr, m, XSTRING (string)->data);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5618 if (cursor_in_echo_area == 0)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5619 fprintf (stderr, "\n");
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5620 fflush (stderr);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5621 }
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5622 }
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5623 else if (INTERACTIVE)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5624 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5625 /* 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
5626 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
5627 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
5628 Lisp_Object mini_window;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5629 struct frame *f, *sf = SELECTED_FRAME ();
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5630
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5631 /* Get the frame containing the minibuffer
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5632 that the selected frame is using. */
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5633 mini_window = FRAME_MINIBUF_WINDOW (sf);
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5634 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5635
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5636 /* 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
5637 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
5638 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
5639 if (FRAME_MESSAGE_BUF (f))
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5640 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5641 int len;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5642 char *a[1];
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5643 a[0] = (char *) XSTRING (string)->data;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5644
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5645 len = doprnt (FRAME_MESSAGE_BUF (f),
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5646 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
5647
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5648 if (log)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5649 message2 (FRAME_MESSAGE_BUF (f), len,
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5650 STRING_MULTIBYTE (string));
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5651 else
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5652 message2_nolog (FRAME_MESSAGE_BUF (f), len,
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5653 STRING_MULTIBYTE (string));
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5654
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5655 /* 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
5656 buffer next time. */
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5657 message_buf_print = 0;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5658 }
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5659 }
10394
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5660 }
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5661
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5662
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
5663 /* 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
5664 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
5665
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5666 /* VARARGS 1 */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5667 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5668 message (m, a1, a2, a3)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5669 char *m;
8834
ba6936b88869 (message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents: 8797
diff changeset
5670 EMACS_INT a1, a2, a3;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5671 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5672 if (noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5673 {
1446
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
5674 if (m)
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
5675 {
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
5676 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
5677 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
5678 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
5679 fprintf (stderr, m, a1, a2, a3);
2526
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
5680 if (cursor_in_echo_area == 0)
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
5681 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
5682 fflush (stderr);
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
5683 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5684 }
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5685 else if (INTERACTIVE)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5686 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5687 /* The frame whose mini-buffer we're going to display the message
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5688 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
5689 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
5690 Lisp_Object mini_window;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5691 struct frame *f, *sf = SELECTED_FRAME ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5692
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5693 /* 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
5694 that the selected frame is using. */
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5695 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
5696 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5697
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5698 /* 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
5699 initialized yet. Error messages get reported properly by
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5700 cmd_error, so this must be just an informative message; toss
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5701 it. */
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5702 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
5703 {
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5704 if (m)
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5705 {
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5706 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
5707 #ifdef NO_ARG_ARRAY
20376
67f1753dc577 (message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents: 20363
diff changeset
5708 char *a[3];
67f1753dc577 (message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents: 20363
diff changeset
5709 a[0] = (char *) a1;
67f1753dc577 (message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents: 20363
diff changeset
5710 a[1] = (char *) a2;
67f1753dc577 (message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents: 20363
diff changeset
5711 a[2] = (char *) a3;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5712
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5713 len = doprnt (FRAME_MESSAGE_BUF (f),
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5714 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
5715 #else
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5716 len = doprnt (FRAME_MESSAGE_BUF (f),
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5717 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
5718 (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
5719 #endif /* NO_ARG_ARRAY */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5720
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5721 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
5722 }
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5723 else
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5724 message1 (0);
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5725
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5726 /* 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
5727 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
5728 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
5729 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5730 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5731 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5732
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5733
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
5734 /* The non-logging version of message. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5735
11193
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5736 void
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5737 message_nolog (m, a1, a2, a3)
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5738 char *m;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5739 EMACS_INT a1, a2, a3;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5740 {
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5741 Lisp_Object old_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5742 old_log_max = Vmessage_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5743 Vmessage_log_max = Qnil;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5744 message (m, a1, a2, a3);
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5745 Vmessage_log_max = old_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5746 }
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5747
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5748
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5749 /* 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
5750 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
5751 critical. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5752
9088
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
5753 void
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
5754 update_echo_area ()
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
5755 {
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5756 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
5757 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5758 Lisp_Object string;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5759 string = Fcurrent_message ();
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5760 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
5761 !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
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
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5765
26447
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5766 /* Make sure echo area buffers in echo_buffers[] are life. If they
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5767 aren't, make new ones. */
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5768
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5769 static void
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5770 ensure_echo_area_buffers ()
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5771 {
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5772 int i;
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5773
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5774 for (i = 0; i < 2; ++i)
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5775 if (!BUFFERP (echo_buffer[i])
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5776 || NILP (XBUFFER (echo_buffer[i])->name))
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5777 {
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5778 char name[30];
30631
0c3f7d0ebb82 (ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents: 30448
diff changeset
5779 Lisp_Object old_buffer;
0c3f7d0ebb82 (ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents: 30448
diff changeset
5780 int j;
0c3f7d0ebb82 (ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents: 30448
diff changeset
5781
0c3f7d0ebb82 (ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents: 30448
diff changeset
5782 old_buffer = echo_buffer[i];
26447
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5783 sprintf (name, " *Echo Area %d*", i);
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5784 echo_buffer[i] = Fget_buffer_create (build_string (name));
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
5785 XBUFFER (echo_buffer[i])->truncate_lines = Qnil;
30631
0c3f7d0ebb82 (ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents: 30448
diff changeset
5786
0c3f7d0ebb82 (ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents: 30448
diff changeset
5787 for (j = 0; j < 2; ++j)
0c3f7d0ebb82 (ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents: 30448
diff changeset
5788 if (EQ (old_buffer, echo_area_buffer[j]))
0c3f7d0ebb82 (ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents: 30448
diff changeset
5789 echo_area_buffer[j] = echo_buffer[i];
26447
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5790 }
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5791 }
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5792
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5793
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
5794 /* Call FN with args A1..A4 with either the current or last displayed
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5795 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
5796
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5797 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
5798 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
5799 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
5800
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5801 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
5802 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
5803
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5804 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
5805 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
5806 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
5807
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5808 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
5809
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5810 static int
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
5811 with_echo_area_buffer (w, which, fn, a1, a2, a3, a4)
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5812 struct window *w;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5813 int which;
30675
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
5814 int (*fn) P_ ((EMACS_INT, Lisp_Object, EMACS_INT, EMACS_INT));
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
5815 EMACS_INT a1;
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
5816 Lisp_Object a2;
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
5817 EMACS_INT a3, a4;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5818 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5819 Lisp_Object buffer;
28206
07ac059dece0 (handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents: 28047
diff changeset
5820 int this_one, the_other, clear_buffer_p, rc;
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
5821 int count = BINDING_STACK_SIZE ();
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5822
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5823 /* If buffers aren't life, make new ones. */
26447
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5824 ensure_echo_area_buffers ();
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5825
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5826 clear_buffer_p = 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5827
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5828 if (which == 0)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5829 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
5830 else if (which > 0)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5831 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
5832 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5833 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5834 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
5835 clear_buffer_p = 1;
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 /* 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
5838 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
5839 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
5840 && 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
5841 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
5842 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5843
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5844 /* 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
5845 have one. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5846 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
5847 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5848 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
5849 = (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
5850 ? echo_buffer[the_other]
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5851 : echo_buffer[this_one]);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5852 clear_buffer_p = 1;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5853 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5854
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5855 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
5856
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5857 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
5858 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
5859
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5860 /* 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
5861 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
5862 == 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
5863 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
5864 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
5865 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
5866 aborts. */
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
5867 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
5868 if (w)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5869 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5870 w->buffer = buffer;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5871 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
5872 }
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
5873
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5874 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
5875 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
5876
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5877 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
5878 del_range (BEG, Z);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5879
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5880 xassert (BEGV >= BEG);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5881 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
5882
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
5883 rc = fn (a1, a2, a3, a4);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5884
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5885 xassert (BEGV >= BEG);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5886 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
5887
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5888 unbind_to (count, Qnil);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5889 return rc;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5890 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5891
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5892
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5893 /* 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
5894 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
5895
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5896 static Lisp_Object
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5897 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
5898 struct window *w;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5899 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5900 int i = 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5901 Lisp_Object vector;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5902
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5903 /* 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
5904 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
5905 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
5906 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
5907
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5908 if (NILP (vector))
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
5909 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
5910
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5911 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
5912 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
5913 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
5914
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5915 if (w)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5916 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5917 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
5918 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
5919 XVECTOR (vector)->contents[i++]
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5920 = 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
5921 XVECTOR (vector)->contents[i++]
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5922 = 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
5923 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5924 else
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5925 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5926 int end = i + 4;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5927 while (i < end)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5928 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
5929 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5930
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5931 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
5932 return vector;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5933 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5934
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5935
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5936 /* 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
5937 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
5938
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5939 static Lisp_Object
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5940 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
5941 Lisp_Object vector;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5942 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5943 int i = 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5944
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
5945 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
5946 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
5947 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
5948
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5949 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
5950 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5951 struct window *w;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5952 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
5953
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5954 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
5955 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
5956 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
5957 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
5958
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5959 w->buffer = buffer;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5960 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
5961 XFASTINT (charpos), XFASTINT (bytepos));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5962 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5963
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5964 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
5965 return Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5966 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5967
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5968
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5969 /* 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
5970 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
5971
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5972 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5973 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
5974 int multibyte_p;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5975 {
26447
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5976 ensure_echo_area_buffers ();
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5977
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5978 if (!message_buf_print)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5979 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5980 /* 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
5981 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
5982 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
5983 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
5984 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5985 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
5986
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5987 /* 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
5988 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
5989 if (Z > BEG)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5990 del_range (BEG, Z);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5991 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
5992
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5993 /* 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
5994 if (multibyte_p
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5995 != !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
5996 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
5997
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5998 /* 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
5999 if (minibuffer_auto_raise)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6000 {
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6001 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
6002 Lisp_Object mini_window;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6003 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
6004 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
6005 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6006
29643
77f1e8db4147 (setup_echo_area_for_printing): Call
Gerd Moellmann <gerd@gnu.org>
parents: 29634
diff changeset
6007 message_log_maybe_newline ();
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6008 message_buf_print = 1;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6009 }
28539
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6010 else
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6011 {
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6012 if (NILP (echo_area_buffer[0]))
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6013 {
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6014 if (EQ (echo_area_buffer[1], echo_buffer[0]))
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6015 echo_area_buffer[0] = echo_buffer[1];
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6016 else
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6017 echo_area_buffer[0] = echo_buffer[0];
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6018 }
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6019
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6020 if (current_buffer != XBUFFER (echo_area_buffer[0]))
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6021 /* Someone switched buffers between print requests. */
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6022 set_buffer_internal (XBUFFER (echo_area_buffer[0]));
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6023 }
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6024 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6025
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6026
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6027 /* 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
6028 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
6029 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
6030 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
6031
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6032 static int
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6033 display_echo_area (w)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6034 struct window *w;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6035 {
28047
91d9cd696b80 (display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents: 28002
diff changeset
6036 int i, no_message_p, window_height_changed_p, count;
91d9cd696b80 (display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents: 28002
diff changeset
6037
91d9cd696b80 (display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents: 28002
diff changeset
6038 /* Temporarily disable garbage collections while displaying the echo
91d9cd696b80 (display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents: 28002
diff changeset
6039 area. This is done because a GC can print a message itself.
91d9cd696b80 (display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents: 28002
diff changeset
6040 That message would modify the echo area buffer's contents while a
91d9cd696b80 (display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents: 28002
diff changeset
6041 redisplay of the buffer is going on, and seriously confuse
91d9cd696b80 (display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents: 28002
diff changeset
6042 redisplay. */
91d9cd696b80 (display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents: 28002
diff changeset
6043 count = inhibit_garbage_collection ();
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6044
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6045 /* 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
6046 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
6047 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
6048 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
6049 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
6050 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
6051
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6052 window_height_changed_p
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6053 = with_echo_area_buffer (w, display_last_displayed_message_p,
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6054 display_echo_area_1,
30675
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6055 (EMACS_INT) w, Qnil, 0, 0);
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6056
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6057 if (no_message_p)
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6058 echo_area_buffer[i] = Qnil;
28047
91d9cd696b80 (display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents: 28002
diff changeset
6059
91d9cd696b80 (display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents: 28002
diff changeset
6060 unbind_to (count, Qnil);
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6061 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
6062 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6063
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6064
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6065 /* Helper for display_echo_area. Display the current buffer which
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6066 contains the current echo area message in window W, a mini-window,
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6067 a pointer to which is passed in A1. A2..A4 are currently not used.
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6068 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
6069 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
6070
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6071 static int
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6072 display_echo_area_1 (a1, a2, a3, a4)
30675
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6073 EMACS_INT a1;
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6074 Lisp_Object a2;
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6075 EMACS_INT a3, a4;
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6076 {
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6077 struct window *w = (struct window *) a1;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6078 Lisp_Object window;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6079 struct text_pos start;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6080 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
6081
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6082 /* 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
6083 matrix for the display. */
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6084 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
6085
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6086 /* Display. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6087 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
6088 XSETWINDOW (window, w);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6089 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
6090 try_window (window, start);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6091
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6092 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
6093 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6094
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6095
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6096 /* 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
6097 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
6098
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6099 void
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6100 resize_echo_area_axactly ()
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6101 {
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6102 if (BUFFERP (echo_area_buffer[0])
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6103 && WINDOWP (echo_area_window))
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6104 {
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6105 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
6106 int resized_p;
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6107
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6108 resized_p = with_echo_area_buffer (w, 0, resize_mini_window_1,
30675
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6109 (EMACS_INT) w, Qnil, 0, 0);
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6110 if (resized_p)
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6111 {
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6112 ++windows_or_buffers_changed;
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6113 ++update_mode_lines;
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6114 redisplay_internal (0);
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6115 }
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6116 }
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6117 }
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6118
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6119
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6120 /* Callback function for with_echo_area_buffer, when used from
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6121 resize_echo_area_axactly. A1 contains a pointer to the window to
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6122 resize, A2 to A4 are not used. Value is what resize_mini_window
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6123 returns. */
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6124
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6125 static int
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6126 resize_mini_window_1 (a1, a2, a3, a4)
30675
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6127 EMACS_INT a1;
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6128 Lisp_Object a2;
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6129 EMACS_INT a3, a4;
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6130 {
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6131 return resize_mini_window ((struct window *) a1, 1);
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6132 }
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6133
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6134
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6135 /* 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
6136 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
6137 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
6138 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
6139
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
6140 int
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6141 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
6142 struct window *w;
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6143 int exact_p;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6144 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6145 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
6146 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
6147
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6148 xassert (MINI_WINDOW_P (w));
25403
5a3db5249db9 (resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents: 25394
diff changeset
6149
5a3db5249db9 (resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents: 25394
diff changeset
6150 /* Nil means don't try to resize. */
33314
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6151 if (NILP (Vresize_mini_windows)
25832
148a6733cd83 (resize_mini_window): Do nothing if frame is an X
Gerd Moellmann <gerd@gnu.org>
parents: 25820
diff changeset
6152 || (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
6153 return 0;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6154
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6155 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
6156 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6157 struct it it;
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6158 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
6159 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
6160 int height, max_height;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6161 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
6162 struct text_pos start;
33591
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6163 struct buffer *old_current_buffer = NULL;
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6164
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6165 if (current_buffer != XBUFFER (w->buffer))
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6166 {
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6167 old_current_buffer = current_buffer;
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6168 set_buffer_internal (XBUFFER (w->buffer));
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6169 }
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6170
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6171 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
6172
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6173 /* 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
6174 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
6175 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
6176 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
6177 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
6178 else
5a3db5249db9 (resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents: 25394
diff changeset
6179 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
6180
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6181 /* 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
6182 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
6183 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
6184
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6185 /* Find out the height of the text in the window. */
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6186 if (it.truncate_lines_p)
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6187 height = 1;
26374
e3e89fd28459 Remove conditional computation on USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents: 26301
diff changeset
6188 else
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6189 {
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6190 last_height = 0;
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6191 move_it_to (&it, ZV, -1, -1, -1, MOVE_TO_POS);
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6192 if (it.max_ascent == 0 && it.max_descent == 0)
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6193 height = it.current_y + last_height;
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6194 else
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6195 height = it.current_y + it.max_ascent + it.max_descent;
29960
8aa954de8db9 (resize_mini_window): Subract the extra line spacing
Gerd Moellmann <gerd@gnu.org>
parents: 29858
diff changeset
6196 height -= it.extra_line_spacing;
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6197 height = (height + unit - 1) / unit;
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6198 }
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6199
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6200 /* 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
6201 if (height > max_height)
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6202 {
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6203 height = max_height;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6204 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
6205 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
6206 start = it.current.pos;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6207 }
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6208 else
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6209 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
6210 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
6211
33314
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6212 if (EQ (Vresize_mini_windows, Qgrow_only))
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6213 {
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6214 /* Let it grow only, until we display an empty message, in which
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6215 case the window shrinks again. */
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6216 if (height > XFASTINT (w->height))
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6217 {
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6218 int old_height = XFASTINT (w->height);
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6219 freeze_window_starts (f, 1);
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6220 grow_mini_window (w, height - XFASTINT (w->height));
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6221 window_height_changed_p = XFASTINT (w->height) != old_height;
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6222 }
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6223 else if (height < XFASTINT (w->height)
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6224 && (exact_p || BEGV == ZV))
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6225 {
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6226 int old_height = XFASTINT (w->height);
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6227 freeze_window_starts (f, 0);
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6228 shrink_mini_window (w);
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6229 window_height_changed_p = XFASTINT (w->height) != old_height;
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6230 }
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6231 }
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6232 else
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6233 {
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6234 /* Always resize to exact size needed. */
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6235 if (height > XFASTINT (w->height))
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6236 {
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6237 int old_height = XFASTINT (w->height);
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6238 freeze_window_starts (f, 1);
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6239 grow_mini_window (w, height - XFASTINT (w->height));
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6240 window_height_changed_p = XFASTINT (w->height) != old_height;
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6241 }
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6242 else if (height < XFASTINT (w->height))
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6243 {
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6244 int old_height = XFASTINT (w->height);
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6245 freeze_window_starts (f, 0);
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6246 shrink_mini_window (w);
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6247
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6248 if (height)
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6249 {
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6250 freeze_window_starts (f, 1);
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6251 grow_mini_window (w, height - XFASTINT (w->height));
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6252 }
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6253
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6254 window_height_changed_p = XFASTINT (w->height) != old_height;
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6255 }
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6256 }
33591
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6257
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6258 if (old_current_buffer)
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6259 set_buffer_internal (old_current_buffer);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6260 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6261
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6262 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
6263 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6264
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6265
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6266 /* 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
6267 current message. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6268
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6269 Lisp_Object
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6270 current_message ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6271 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6272 Lisp_Object msg;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6273
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6274 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
6275 msg = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6276 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6277 {
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6278 with_echo_area_buffer (0, 0, current_message_1,
30675
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6279 (EMACS_INT) &msg, Qnil, 0, 0);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6280 if (NILP (msg))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6281 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
6282 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6283
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6284 return msg;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6285 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6286
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6287
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6288 static int
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6289 current_message_1 (a1, a2, a3, a4)
30675
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6290 EMACS_INT a1;
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6291 Lisp_Object a2;
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6292 EMACS_INT a3, a4;
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6293 {
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6294 Lisp_Object *msg = (Lisp_Object *) a1;
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6295
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6296 if (Z > BEG)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6297 *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
6298 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6299 *msg = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6300 return 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6301 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6302
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6303
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6304 /* 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
6305 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
6306 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
6307 worth optimizing. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6308
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6309 int
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6310 push_message ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6311 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6312 Lisp_Object msg;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6313 msg = current_message ();
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6314 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
6315 return STRINGP (msg);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6316 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6317
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6318
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6319 /* 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
6320
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6321 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6322 restore_message ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6323 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6324 Lisp_Object msg;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6325
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6326 xassert (CONSP (Vmessage_stack));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6327 msg = XCAR (Vmessage_stack);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6328 if (STRINGP (msg))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6329 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
6330 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6331 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
6332 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6333
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6334
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6335 /* 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
6336
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6337 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6338 pop_message ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6339 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6340 xassert (CONSP (Vmessage_stack));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6341 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
6342 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6343
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6344
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6345 /* 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
6346 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
6347 somewhere. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6348
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6349 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6350 check_message_stack ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6351 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6352 if (!NILP (Vmessage_stack))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6353 abort ();
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6354 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6355
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6356
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6357 /* 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
6358 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
6359
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6360 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6361 truncate_echo_area (nchars)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6362 int nchars;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6363 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6364 if (nchars == 0)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6365 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
6366 /* 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
6367 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
6368 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
6369 else if (!noninteractive
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6370 && INTERACTIVE
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6371 && !NILP (echo_area_buffer[0]))
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6372 {
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6373 struct frame *sf = SELECTED_FRAME ();
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6374 if (FRAME_MESSAGE_BUF (sf))
30675
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6375 with_echo_area_buffer (0, 0, truncate_message_1, nchars, Qnil, 0, 0);
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6376 }
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6377 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6378
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6379
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6380 /* 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
6381 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
6382
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6383 static int
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6384 truncate_message_1 (nchars, a2, a3, a4)
30675
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6385 EMACS_INT nchars;
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6386 Lisp_Object a2;
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6387 EMACS_INT a3, a4;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6388 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6389 if (BEG + nchars < Z)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6390 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
6391 if (Z == BEG)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6392 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
6393 return 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6394 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6395
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6396
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6397 /* 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
6398
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6399 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
6400 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
6401 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
6402
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6403 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
6404 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
6405 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
6406
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6407 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6408 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
6409 char *s;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6410 Lisp_Object string;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6411 int nbytes;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6412 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6413 message_enable_multibyte
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6414 = ((s && multibyte_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6415 || (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
6416
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6417 with_echo_area_buffer (0, -1, set_message_1,
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6418 (EMACS_INT) s, string, nbytes, multibyte_p);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6419 message_buf_print = 0;
31876
de16d989722a (help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31849
diff changeset
6420 help_echo_showing_p = 0;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6421 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6422
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6423
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6424 /* Helper function for set_message. Arguments have the same meaning
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6425 as there, with A1 corresponding to S and A2 corresponding to STRING
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6426 This function is called with the echo area buffer being
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6427 current. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6428
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6429 static int
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6430 set_message_1 (a1, a2, nbytes, multibyte_p)
30675
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6431 EMACS_INT a1;
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6432 Lisp_Object a2;
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6433 EMACS_INT nbytes, multibyte_p;
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6434 {
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6435 char *s = (char *) a1;
30675
8a516a1f76a7 (message_dolog): Save and protect string "*Messages*" to reuse as buffer name,
Ken Raeburn <raeburn@raeburn.org>
parents: 30652
diff changeset
6436 Lisp_Object string = a2;
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6437
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6438 xassert (BEG == Z);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6439
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6440 /* 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
6441 if (message_enable_multibyte
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6442 != !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
6443 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
6444
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6445 current_buffer->truncate_lines = message_truncate_lines ? Qt : Qnil;
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6446
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6447 /* 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
6448 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
6449
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6450 if (STRINGP (string))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6451 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6452 int nchars;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6453
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6454 if (nbytes == 0)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6455 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
6456 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
6457
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6458 /* 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
6459 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
6460 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
6461 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
6462 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6463 else if (s)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6464 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6465 if (nbytes == 0)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6466 nbytes = strlen (s);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6467
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6468 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
6469 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6470 /* 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
6471 int i, c, n;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6472 unsigned char work[1];
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6473
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6474 /* 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
6475 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
6476 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6477 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
6478 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
6479 ? c
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6480 : 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
6481 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
6482 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6483 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6484 else if (!multibyte_p
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6485 && !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
6486 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6487 /* 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
6488 int i, c, n;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6489 unsigned char *msg = (unsigned char *) s;
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
6490 unsigned char str[MAX_MULTIBYTE_LENGTH];
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6491
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6492 /* 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
6493 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
6494 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6495 c = unibyte_char_to_multibyte (msg[i]);
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
6496 n = CHAR_STRING (c, str);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
6497 insert_1_both (str, 1, n, 1, 0, 0);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6498 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6499 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6500 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6501 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
6502 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6503
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6504 return 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6505 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6506
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6507
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6508 /* 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
6509 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
6510 last displayed. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6511
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6512 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6513 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
6514 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
6515 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6516 if (current_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6517 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
6518
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6519 if (last_displayed_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6520 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
6521
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6522 message_buf_print = 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6523 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6524
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6525 /* Clear garbaged frames.
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6526
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6527 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
6528 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
6529 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
6530 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
6531 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
6532 and ensure a complete redisplay of all windows. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6533
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6534 static void
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6535 clear_garbaged_frames ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6536 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
6537 if (frame_garbaged)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6538 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6539 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6540
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6541 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6542 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6543 struct frame *f = XFRAME (frame);
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 if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6546 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6547 clear_current_matrices (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6548 f->garbaged = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6549 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6550 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6551
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
6552 frame_garbaged = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6553 ++windows_or_buffers_changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6554 }
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6555 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6556
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6557
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6558 /* 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
6559 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
6560 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
6561
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6562 static int
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6563 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
6564 int update_frame_p;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6565 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6566 Lisp_Object mini_window;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6567 struct window *w;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6568 struct frame *f;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6569 int window_height_changed_p = 0;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6570 struct frame *sf = SELECTED_FRAME ();
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6571
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6572 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
6573 w = XWINDOW (mini_window);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6574 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
6575
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6576 /* 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
6577 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
6578 return 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6579
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
6580 /* The terminal frame is used as the first Emacs frame on the Mac OS. */
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
6581 #ifndef macintosh
27897
a6384a2b5574 (handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents: 27843
diff changeset
6582 #ifdef HAVE_WINDOW_SYSTEM
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6583 /* 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
6584 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
6585 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
6586 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
6587 && !NILP (Vwindow_system))
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6588 return 0;
27897
a6384a2b5574 (handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents: 27843
diff changeset
6589 #endif /* HAVE_WINDOW_SYSTEM */
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
6590 #endif
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6591
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6592 /* Redraw garbaged frames. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6593 if (frame_garbaged)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6594 clear_garbaged_frames ();
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6595
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6596 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
6597 {
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
6598 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
6599 window_height_changed_p = display_echo_area (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6600 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
6601
33068
a31c3787231b (echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents: 32912
diff changeset
6602 /* Update the display, unless called from redisplay_internal.
a31c3787231b (echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents: 32912
diff changeset
6603 Also don't update the screen during redisplay itself. The
a31c3787231b (echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents: 32912
diff changeset
6604 update will happen at the end of redisplay, and an update
a31c3787231b (echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents: 32912
diff changeset
6605 here could cause confusion. */
a31c3787231b (echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents: 32912
diff changeset
6606 if (update_frame_p && !redisplaying_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6607 {
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6608 int n = 0;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6609
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6610 /* If the display update has been interrupted by pending
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6611 input, update mode lines in the frame. Due to the
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6612 pending input, it might have been that redisplay hasn't
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6613 been called, so that mode lines above the echo area are
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6614 garbaged. This looks odd, so we prevent it here. */
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6615 if (!display_completed)
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6616 n = redisplay_mode_lines (FRAME_ROOT_WINDOW (f), 0);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6617
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6618 if (window_height_changed_p)
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6619 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6620 /* Must update other windows. */
31294
52f31a08e52f (echo_area_display): Check display_completed instead
Gerd Moellmann <gerd@gnu.org>
parents: 31170
diff changeset
6621 windows_or_buffers_changed = 1;
25388
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
6622 redisplay_internal (0);
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6623 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6624 else if (FRAME_WINDOW_P (f) && n == 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6625 {
31294
52f31a08e52f (echo_area_display): Check display_completed instead
Gerd Moellmann <gerd@gnu.org>
parents: 31170
diff changeset
6626 /* Window configuration is the same as before.
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6627 Can do with a display update of the echo area,
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6628 unless we displayed some mode lines. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6629 update_single_window (w, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6630 rif->flush_display (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6631 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6632 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6633 update_frame (f, 1, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6634 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6635 }
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
6636 else if (!EQ (mini_window, selected_window))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6637 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
6638
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
6639 /* 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
6640 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
6641
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6642 /* Prevent redisplay optimization in redisplay_internal by resetting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6643 this_line_start_pos. This is done because the mini-buffer now
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6644 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
6645 if (EQ (mini_window, selected_window))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6646 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
6647
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6648 return window_height_changed_p;
25012
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
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
6652
25012
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 Frame Titles
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6655 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6656
6308
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
6657
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
6658 #ifdef HAVE_WINDOW_SYSTEM
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 /* A buffer for constructing frame titles in it; allocated from the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6661 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
6662
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6663 static char *frame_title_buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6664
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6665 /* The buffer's end, and a current output position in it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6666
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6667 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
6668 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
6669
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6670
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6671 /* 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
6672 Re-allocate frame_title_buf if necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6673
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6674 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6675 store_frame_title_char (c)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6676 char c;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6677 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6678 /* If output position has reached the end of the allocated buffer,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6679 double the buffer's size. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6680 if (frame_title_ptr == frame_title_buf_end)
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 int len = frame_title_ptr - frame_title_buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6683 int new_size = 2 * len * sizeof *frame_title_buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6684 frame_title_buf = (char *) xrealloc (frame_title_buf, new_size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6685 frame_title_buf_end = frame_title_buf + new_size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6686 frame_title_ptr = frame_title_buf + len;
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 *frame_title_ptr++ = c;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6690 }
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 /* Store part of a frame title in frame_title_buf, beginning at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6694 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
6695 than PRECISION number of bytes from STR; PRECISION <= 0 means copy
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6696 the whole string. Pad with spaces until FIELD_WIDTH number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6697 characters have been copied; FIELD_WIDTH <= 0 means don't pad.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6698 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
6699 title. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6700
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
6701 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6702 store_frame_title (str, field_width, precision)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6703 unsigned char *str;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6704 int field_width, precision;
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 n = 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 /* Copy at most PRECISION chars from STR. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6709 while ((precision <= 0 || n < precision)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6710 && *str)
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 store_frame_title_char (*str++);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6713 ++n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6714 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6715
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6716 /* Fill up with spaces until FIELD_WIDTH reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6717 while (field_width > 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6718 && n < field_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6719 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6720 store_frame_title_char (' ');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6721 ++n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6722 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6723
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6724 return n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6725 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6726
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6727
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6728 /* 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
6729 Vicon_title_format if FRAME is iconified, otherwise it is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6730 frame_title_format. */
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
6731
6308
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
6732 static void
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
6733 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
6734 Lisp_Object frame;
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
6735 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6736 struct frame *f = XFRAME (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6737
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6738 if (FRAME_WINDOW_P (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6739 || FRAME_MINIBUF_ONLY_P (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6740 || f->explicit_name)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6741 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6742 /* Do we have more than one visible frame on this X display? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6743 Lisp_Object tail;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6744 Lisp_Object fmt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6745 struct buffer *obuf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6746 int len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6747 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6748
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
6749 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
6750 {
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
6751 struct frame *tf = XFRAME (XCAR (tail));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6752
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6753 if (tf != f
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6754 && FRAME_KBOARD (tf) == FRAME_KBOARD (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6755 && !FRAME_MINIBUF_ONLY_P (tf)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6756 && (FRAME_VISIBLE_P (tf) || FRAME_ICONIFIED_P (tf)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6757 break;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6760 /* Set global variable indicating that multiple frames exist. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6761 multiple_frames = CONSP (tail);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6762
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6763 /* Switch to the buffer of selected window of the frame. Set up
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6764 frame_title_ptr so that display_mode_element will output into it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6765 then display the title. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6766 obuf = current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6767 Fset_buffer (XWINDOW (f->selected_window)->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6768 fmt = FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6769 frame_title_ptr = frame_title_buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6770 init_iterator (&it, XWINDOW (f->selected_window), -1, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6771 NULL, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6772 len = display_mode_element (&it, 0, -1, -1, fmt);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6773 frame_title_ptr = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6774 set_buffer_internal (obuf);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6775
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6776 /* Set the title only if it's changed. This avoids consing in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6777 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
6778 already wasted too much time by walking through the list with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6779 display_mode_element, then we might need to optimize at a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6780 higher level than this.) */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6781 if (! STRINGP (f->name)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6782 || STRING_BYTES (XSTRING (f->name)) != len
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6783 || bcmp (frame_title_buf, XSTRING (f->name)->data, len) != 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6784 x_implicitly_set_name (f, make_string (frame_title_buf, len), Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6785 }
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 #else /* not HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6789
8783
226c214398a6 [!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents: 8772
diff changeset
6790 #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
6791 #define store_frame_title(str, mincol, maxcol) 0
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6792
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6793 #endif /* not HAVE_WINDOW_SYSTEM */
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6796
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6797
25012
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 Menu Bars
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6800 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6801
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6802
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6803 /* Prepare for redisplay by updating menu-bar item lists when
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6804 appropriate. This can call eval. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6805
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6806 void
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6807 prepare_menu_bars ()
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6808 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6809 int all_windows;
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6810 struct gcpro gcpro1, gcpro2;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6811 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6812 struct frame *tooltip_frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6813
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6814 #ifdef HAVE_X_WINDOWS
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6815 tooltip_frame = tip_frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6816 #else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6817 tooltip_frame = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6818 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6819
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6820 /* Update all frame titles based on their buffer names, etc. We do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6821 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
6822 up-to-date frame titles. */
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
6823 #ifdef HAVE_WINDOW_SYSTEM
13826
cbe1d1a07eb2 (prepare_menu_bars): If update_mode_lines,
Richard M. Stallman <rms@gnu.org>
parents: 13760
diff changeset
6824 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
6825 {
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
6826 Lisp_Object tail, frame;
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
6827
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
6828 FOR_EACH_FRAME (tail, frame)
25012
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 f = XFRAME (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6831 if (f != tooltip_frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6832 && (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6833 x_consider_frame_title (frame);
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6836 #endif /* HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6837
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6838 /* Update the menu bar item lists, if appropriate. This has to be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6839 done before any actual redisplay or generation of display lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6840 all_windows = (update_mode_lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6841 || buffer_shared > 1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6842 || windows_or_buffers_changed);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6843 if (all_windows)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6844 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6845 Lisp_Object tail, frame;
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
6846 int count = BINDING_STACK_SIZE ();
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6847
21179
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
6848 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
6849
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6850 FOR_EACH_FRAME (tail, frame)
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6851 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6852 f = XFRAME (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6853
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6854 /* Ignore tooltip frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6855 if (f == tooltip_frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6856 continue;
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 /* If a window on this frame changed size, report that to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6859 the user and clear the size-change flag. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6860 if (FRAME_WINDOW_SIZES_CHANGED (f))
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6861 {
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6862 Lisp_Object functions;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6863
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6864 /* Clear flag first in case we get an error below. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6865 FRAME_WINDOW_SIZES_CHANGED (f) = 0;
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6866 functions = Vwindow_size_change_functions;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6867 GCPRO2 (tail, functions);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6868
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6869 while (CONSP (functions))
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6870 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6871 call1 (XCAR (functions), frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6872 functions = XCDR (functions);
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6873 }
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6874 UNGCPRO;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6875 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6876
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6877 GCPRO1 (tail);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6878 update_menu_bar (f, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6879 #ifdef HAVE_WINDOW_SYSTEM
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6880 update_tool_bar (f, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6881 #endif
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6882 UNGCPRO;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6883 }
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6884
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6885 unbind_to (count, Qnil);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6886 }
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
6887 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6888 {
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6889 struct frame *sf = SELECTED_FRAME ();
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6890 update_menu_bar (sf, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6891 #ifdef HAVE_WINDOW_SYSTEM
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6892 update_tool_bar (sf, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6893 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6894 }
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 /* Motif needs this. See comment in xmenu.c. Turn it off when
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6897 pending_menu_activation is not defined. */
15813
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
6898 #ifdef USE_X_TOOLKIT
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
6899 pending_menu_activation = 0;
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
6900 #endif
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6901 }
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6904 /* 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
6905 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
6906 eval.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6907
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6908 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
6909
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6910 static void
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6911 update_menu_bar (f, save_match_data)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6912 struct frame *f;
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6913 int save_match_data;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6914 {
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
6915 Lisp_Object window;
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
6916 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
6917
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
6918 window = FRAME_SELECTED_WINDOW (f);
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
6919 w = XWINDOW (window);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6920
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6921 if (update_mode_lines)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6922 w->update_mode_line = Qt;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6923
14265
9bc9be522a4d (update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents: 14263
diff changeset
6924 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
6925 ?
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
6926 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh)
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
6927 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
6928 #else
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
6929 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
6930 #endif
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
6931 : FRAME_MENU_BAR_LINES (f) > 0)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6932 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6933 /* 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
6934 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
6935 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
6936 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
6937 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
6938 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
6939 windows_or_buffers_changed anyway. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6940 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
6941 || !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
6942 || ((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
6943 < BUF_MODIFF (XBUFFER (w->buffer)))
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6944 != !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
6945 || ((!NILP (Vtransient_mark_mode)
497ad07c31c2 (update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents: 12017
diff changeset
6946 && !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
6947 != !NILP (w->region_showing)))
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6948 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6949 struct buffer *prev = current_buffer;
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
6950 int count = BINDING_STACK_SIZE ();
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6951
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
6952 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
6953 if (save_match_data)
21179
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
6954 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
6955 if (NILP (Voverriding_local_map_menu_flag))
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
6956 {
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
6957 specbind (Qoverriding_terminal_local_map, Qnil);
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
6958 specbind (Qoverriding_local_map, Qnil);
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
6959 }
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6960
12141
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
6961 /* Run the Lucid hook. */
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
6962 call1 (Vrun_hooks, Qactivate_menubar_hook);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6963
12141
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
6964 /* If it has changed current-menubar from previous value,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6965 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
6966 if (! NILP (Vlucid_menu_bar_dirty_flag))
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
6967 call0 (Qrecompute_lucid_menubar);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6968
14299
037a89c9d068 (update_menu_bar):
Karl Heuer <kwzh@gnu.org>
parents: 14265
diff changeset
6969 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
6970 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
6971
15543
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6972 /* Redisplay the menu bar in case we changed it. */
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
6973 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh)
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
6974 if (FRAME_WINDOW_P (f)
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
6975 #if defined (macintosh)
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
6976 /* All frames on Mac OS share the same menubar. So only the
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
6977 selected frame should be allowed to set it. */
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
6978 && f == SELECTED_FRAME ()
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
6979 #endif
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
6980 )
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
6981 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
6982 else
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6983 /* On a terminal screen, the menu bar is an ordinary screen
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6984 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
6985 w->update_mode_line = Qt;
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6986 #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
6987 /* 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
6988 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
6989 w->update_mode_line = Qt;
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
6990 #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
6991
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6992 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
6993 set_buffer_internal_1 (prev);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6994 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6995 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6996 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6997
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6998
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6999
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7000 /***********************************************************************
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7001 Tool-bars
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7002 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7003
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7004 #ifdef HAVE_WINDOW_SYSTEM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7005
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7006 /* 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
7007 before we start to fill in any display lines. Called from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7008 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
7009 and restore it here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7010
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7011 static void
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7012 update_tool_bar (f, save_match_data)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7013 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7014 int save_match_data;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7015 {
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7016 if (WINDOWP (f->tool_bar_window)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7017 && XFASTINT (XWINDOW (f->tool_bar_window)->height) > 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7018 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7019 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7020 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7021
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7022 window = FRAME_SELECTED_WINDOW (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7023 w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7024
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7025 /* If the user has switched buffers or windows, we need to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7026 recompute to reflect the new bindings. But we'll
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7027 recompute when update_mode_lines is set too; that means
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7028 that people can use force-mode-line-update to request
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7029 that the menu bar be recomputed. The adverse effect on
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7030 the rest of the redisplay algorithm is about the same as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7031 windows_or_buffers_changed anyway. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7032 if (windows_or_buffers_changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7033 || !NILP (w->update_mode_line)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7034 || ((BUF_SAVE_MODIFF (XBUFFER (w->buffer))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7035 < BUF_MODIFF (XBUFFER (w->buffer)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7036 != !NILP (w->last_had_star))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7037 || ((!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7038 && !NILP (XBUFFER (w->buffer)->mark_active))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7039 != !NILP (w->region_showing)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7040 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7041 struct buffer *prev = current_buffer;
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
7042 int count = BINDING_STACK_SIZE ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7043
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7044 /* Set current_buffer to the buffer of the selected
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7045 window of the frame, so that we get the right local
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7046 keymaps. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7047 set_buffer_internal_1 (XBUFFER (w->buffer));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7048
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7049 /* Save match data, if we must. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7050 if (save_match_data)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7051 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
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 /* Make sure that we don't accidentally use bogus keymaps. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7054 if (NILP (Voverriding_local_map_menu_flag))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7055 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7056 specbind (Qoverriding_terminal_local_map, Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7057 specbind (Qoverriding_local_map, Qnil);
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
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7060 /* Build desired tool-bar items from keymaps. */
33762
07c6230bc933 (update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents: 33757
diff changeset
7061 f->tool_bar_items
07c6230bc933 (update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents: 33757
diff changeset
7062 = tool_bar_items (f->tool_bar_items, &f->n_tool_bar_items);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7063
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7064 /* Redisplay the tool-bar in case we changed it. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7065 w->update_mode_line = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7066
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7067 unbind_to (count, Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7068 set_buffer_internal_1 (prev);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7069 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7070 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7071 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7072
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7073
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7074 /* Set F->desired_tool_bar_string to a Lisp string representing frame
33762
07c6230bc933 (update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents: 33757
diff changeset
7075 F's desired tool-bar contents. F->tool_bar_items must have
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7076 been set up previously by calling prepare_menu_bars. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7077
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7078 static void
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7079 build_desired_tool_bar_string (f)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7080 struct frame *f;
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 int i, size, size_needed, string_idx;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7083 struct gcpro gcpro1, gcpro2, gcpro3;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7084 Lisp_Object image, plist, props;
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 image = plist = props = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7087 GCPRO3 (image, plist, props);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7088
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7089 /* 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
7090 Otherwise, make a new string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7091
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7092 /* 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
7093 size = (STRINGP (f->desired_tool_bar_string)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7094 ? XSTRING (f->desired_tool_bar_string)->size
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7095 : 0);
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 /* Each image in the string we build is preceded by a space,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7098 and there is a space at the end. */
33762
07c6230bc933 (update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents: 33757
diff changeset
7099 size_needed = f->n_tool_bar_items + 1;
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7100
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7101 /* Reuse f->desired_tool_bar_string, if possible. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7102 if (size < size_needed)
28464
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
7103 f->desired_tool_bar_string = Fmake_string (make_number (size_needed),
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
7104 make_number (' '));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7105 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7106 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7107 props = list4 (Qdisplay, Qnil, Qmenu_item, Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7108 Fremove_text_properties (make_number (0), make_number (size),
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7109 props, f->desired_tool_bar_string);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7110 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7111
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7112 /* 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
7113 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
7114 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
7115 for (i = 0, string_idx = 0;
33762
07c6230bc933 (update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents: 33757
diff changeset
7116 i < f->n_tool_bar_items;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7117 ++i, string_idx += 1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7118 {
33762
07c6230bc933 (update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents: 33757
diff changeset
7119 #define PROP(IDX) AREF (f->tool_bar_items, i * TOOL_BAR_ITEM_NSLOTS + (IDX))
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7120
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7121 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7122 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P));
31650
8b3846ae64fe (build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents: 31610
diff changeset
7123 int margin, relief, idx;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7124 extern Lisp_Object QCrelief, QCmargin, QCalgorithm, Qimage;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7125 extern Lisp_Object Qlaplace;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7126
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7127 /* If image is a vector, choose the image according to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7128 button state. */
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7129 image = PROP (TOOL_BAR_ITEM_IMAGES);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7130 if (VECTORP (image))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7131 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7132 if (enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7133 idx = (selected_p
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7134 ? TOOL_BAR_IMAGE_ENABLED_SELECTED
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7135 : TOOL_BAR_IMAGE_ENABLED_DESELECTED);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7136 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7137 idx = (selected_p
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7138 ? TOOL_BAR_IMAGE_DISABLED_SELECTED
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7139 : TOOL_BAR_IMAGE_DISABLED_DESELECTED);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7140
31650
8b3846ae64fe (build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents: 31610
diff changeset
7141 xassert (ASIZE (image) >= idx);
8b3846ae64fe (build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents: 31610
diff changeset
7142 image = AREF (image, idx);
8b3846ae64fe (build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents: 31610
diff changeset
7143 }
8b3846ae64fe (build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents: 31610
diff changeset
7144 else
8b3846ae64fe (build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents: 31610
diff changeset
7145 idx = -1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7146
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7147 /* Ignore invalid image specifications. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7148 if (!valid_image_p (image))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7149 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7150
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7151 /* Display the tool-bar button pressed, or depressed. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7152 plist = Fcopy_sequence (XCDR (image));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7153
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7154 /* Compute margin and relief to draw. */
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7155 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
7156 margin = relief + max (0, tool_bar_button_margin);
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7157
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7158 if (auto_raise_tool_bar_buttons_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7159 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7160 /* Add a `:relief' property to the image spec if the item is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7161 selected. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7162 if (selected_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7163 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7164 plist = Fplist_put (plist, QCrelief, make_number (-relief));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7165 margin -= relief;
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7168 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7169 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7170 /* If image is selected, display it pressed, i.e. with a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7171 negative relief. If it's not selected, display it with a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7172 raised relief. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7173 plist = Fplist_put (plist, QCrelief,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7174 (selected_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7175 ? make_number (-relief)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7176 : make_number (relief)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7177 margin -= relief;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7178 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7179
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7180 /* Put a margin around the image. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7181 if (margin)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7182 plist = Fplist_put (plist, QCmargin, make_number (margin));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7183
31650
8b3846ae64fe (build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents: 31610
diff changeset
7184 /* If button is not enabled, and we don't have special images
8b3846ae64fe (build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents: 31610
diff changeset
7185 for the disabled state, make the image appear disabled by
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7186 applying an appropriate algorithm to it. */
31650
8b3846ae64fe (build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents: 31610
diff changeset
7187 if (!enabled_p && idx < 0)
8b3846ae64fe (build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents: 31610
diff changeset
7188 plist = Fplist_put (plist, QCalgorithm, Qdisabled);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7189
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7190 /* Put a `display' text property on the string for the image to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7191 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
7192 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
7193 vector. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7194 image = Fcons (Qimage, plist);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7195 props = list4 (Qdisplay, image,
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7196 Qmenu_item, make_number (i * TOOL_BAR_ITEM_NSLOTS)),
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7197 Fadd_text_properties (make_number (string_idx),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7198 make_number (string_idx + 1),
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7199 props, f->desired_tool_bar_string);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7200 #undef PROP
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7201 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7202
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7203 UNGCPRO;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7206
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7207 /* Display one line of the tool-bar of frame IT->f. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7208
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7209 static void
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7210 display_tool_bar_line (it)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7211 struct it *it;
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 struct glyph_row *row = it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7214 int max_x = it->last_visible_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7215 struct glyph *last;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7216
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7217 prepare_desired_row (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7218 row->y = it->current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7219
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7220 while (it->current_x < max_x)
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 int x_before, x, n_glyphs_before, i, nglyphs;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7223
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7224 /* Get the next display element. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7225 if (!get_next_display_element (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7226 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7227
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7228 /* Produce glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7229 x_before = it->current_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7230 n_glyphs_before = it->glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7231 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7232
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7233 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7234 i = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7235 x = x_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7236 while (i < nglyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7237 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7238 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7239
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7240 if (x + glyph->pixel_width > max_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7241 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7242 /* Glyph doesn't fit on line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7243 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7244 it->current_x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7245 goto out;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7246 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7247
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7248 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7249 x += glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7250 ++i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7251 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7252
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7253 /* Stop at line ends. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7254 if (ITERATOR_AT_END_OF_LINE_P (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7255 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7256
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
7257 set_iterator_to_next (it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7258 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7259
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7260 out:;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7261
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7262 row->displays_text_p = row->used[TEXT_AREA] != 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7263 extend_face_to_end_of_line (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7264 last = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA] - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7265 last->right_box_line_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7266 compute_line_metrics (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7267
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7268 /* 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
7269 if (!row->displays_text_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7270 {
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
7271 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
7272 row->ascent = row->phys_ascent = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7273 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7274
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7275 row->full_width_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7276 row->continued_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7277 row->truncated_on_left_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7278 row->truncated_on_right_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7279
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7280 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7281 it->current_y += row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7282 ++it->vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7283 ++it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7284 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7285
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7286
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7287 /* 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
7288 items of frame F visible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7289
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7290 static int
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7291 tool_bar_lines_needed (f)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7292 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7293 {
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7294 struct window *w = XWINDOW (f->tool_bar_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7295 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7296
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7297 /* Initialize an iterator for iteration over
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7298 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
7299 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
7300 it.first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7301 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
7302 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
7303
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7304 while (!ITERATOR_AT_END_P (&it))
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 it.glyph_row = w->desired_matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7307 clear_glyph_row (it.glyph_row);
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7308 display_tool_bar_line (&it);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7309 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7310
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7311 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
7312 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7313
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7314
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7315 /* 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
7316 height should be changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7317
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7318 static int
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7319 redisplay_tool_bar (f)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7320 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7321 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7322 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7323 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7324 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7325 int change_height_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7326
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7327 /* 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
7328 do anything. This means you must start with tool-bar-lines
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7329 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
7330 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
7331 if (!WINDOWP (f->tool_bar_window)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7332 || (w = XWINDOW (f->tool_bar_window),
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7333 XFASTINT (w->height) == 0))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7334 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7335
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7336 /* Set up an iterator for the tool-bar window. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7337 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
7338 it.first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7339 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7340 row = it.glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7341
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7342 /* 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
7343 build_desired_tool_bar_string (f);
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7344 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
7345
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7346 /* 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
7347 while (it.current_y < it.last_visible_y)
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7348 display_tool_bar_line (&it);
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7349
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7350 /* 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
7351 window, so don't do it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7352 w->desired_matrix->no_scrolling_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7353 w->must_be_updated_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7354
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7355 if (auto_resize_tool_bars_p)
25012
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 int nlines;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7358
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7359 /* If there are blank lines at the end, except for a partially
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7360 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
7361 CANON_Y_UNIT, change the tool-bar's height. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7362 row = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7363 if (!row->displays_text_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7364 && row->height >= CANON_Y_UNIT (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7365 change_height_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7366
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7367 /* If row displays tool-bar items, but is partially visible,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7368 change the tool-bar's height. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7369 if (row->displays_text_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7370 && MATRIX_ROW_BOTTOM_Y (row) > it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7371 change_height_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7372
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7373 /* Resize windows as needed by changing the `tool-bar-lines'
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7374 frame parameter. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7375 if (change_height_p
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7376 && (nlines = tool_bar_lines_needed (f),
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7377 nlines != XFASTINT (w->height)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7378 {
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7379 extern Lisp_Object Qtool_bar_lines;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7380 Lisp_Object frame;
33099
006a1f5b5f43 (redisplay_tool_bar): Don't set fonts_changed_p if
Gerd Moellmann <gerd@gnu.org>
parents: 33074
diff changeset
7381 int old_height = XFASTINT (w->height);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7382
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7383 XSETFRAME (frame, f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7384 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7385 Fmodify_frame_parameters (frame,
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7386 Fcons (Fcons (Qtool_bar_lines,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7387 make_number (nlines)),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7388 Qnil));
33099
006a1f5b5f43 (redisplay_tool_bar): Don't set fonts_changed_p if
Gerd Moellmann <gerd@gnu.org>
parents: 33074
diff changeset
7389 if (XFASTINT (w->height) != old_height)
006a1f5b5f43 (redisplay_tool_bar): Don't set fonts_changed_p if
Gerd Moellmann <gerd@gnu.org>
parents: 33074
diff changeset
7390 fonts_changed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7391 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7392 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7393
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7394 return change_height_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7395 }
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
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7398 /* 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
7399 on frame F. Return in *PROP_IDX the index where tool-bar item
33762
07c6230bc933 (update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents: 33757
diff changeset
7400 properties start in F->tool_bar_items. Value is zero if
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7401 GLYPH doesn't display a tool-bar item. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7402
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7403 int
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7404 tool_bar_item_info (f, glyph, prop_idx)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7405 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7406 struct glyph *glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7407 int *prop_idx;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7408 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7409 Lisp_Object prop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7410 int success_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7411
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7412 /* Get the text property `menu-item' at pos. The value of that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7413 property is the start index of this item's properties in
33762
07c6230bc933 (update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents: 33757
diff changeset
7414 F->tool_bar_items. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7415 prop = Fget_text_property (make_number (glyph->charpos),
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7416 Qmenu_item, f->current_tool_bar_string);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7417 if (INTEGERP (prop))
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 *prop_idx = XINT (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7420 success_p = 1;
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7423 success_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7424
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7425 return success_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7426 }
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 #endif /* HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7429
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7430
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7431
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7432 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7433 Horizontal scrolling
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7436 static int hscroll_window_tree P_ ((Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7437 static int hscroll_windows P_ ((Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7438
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7439 /* 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
7440 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
7441 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
7442 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
7443 changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7444
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7445 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7446 hscroll_window_tree (window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7447 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7448 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7449 int hscrolled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7450
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7451 while (WINDOWP (window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7452 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7453 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7454
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7455 if (WINDOWP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7456 hscrolled_p |= hscroll_window_tree (w->hchild);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7457 else if (WINDOWP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7458 hscrolled_p |= hscroll_window_tree (w->vchild);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7459 else if (w->cursor.vpos >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7460 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7461 int hscroll_margin, text_area_x, text_area_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7462 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
7463 struct glyph_row *current_cursor_row
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7464 = 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
7465 struct glyph_row *desired_cursor_row
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7466 = 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
7467 struct glyph_row *cursor_row
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7468 = (desired_cursor_row->enabled_p
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7469 ? desired_cursor_row
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7470 : current_cursor_row);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7471
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7472 window_box (w, TEXT_AREA, &text_area_x, &text_area_y,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7473 &text_area_width, &text_area_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7474
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7475 /* Scroll when cursor is inside this scroll margin. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7476 hscroll_margin = 5 * CANON_X_UNIT (XFRAME (w->frame));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7477
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7478 if ((XFASTINT (w->hscroll)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7479 && w->cursor.x < hscroll_margin)
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7480 || (cursor_row->enabled_p
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7481 && cursor_row->truncated_on_right_p
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7482 && (w->cursor.x > text_area_width - hscroll_margin)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7483 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7484 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7485 int hscroll;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7486 struct buffer *saved_current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7487 int pt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7488
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7489 /* Find point in a display of infinite width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7490 saved_current_buffer = current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7491 current_buffer = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7492
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7493 if (w == XWINDOW (selected_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7494 pt = BUF_PT (current_buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7495 else
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 pt = marker_position (w->pointm);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7498 pt = max (BEGV, pt);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7499 pt = min (ZV, pt);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7500 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7501
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7502 /* Move iterator to pt starting at cursor_row->start in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7503 a line with infinite width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7504 init_to_row_start (&it, w, cursor_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7505 it.last_visible_x = INFINITY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7506 move_it_in_display_line_to (&it, pt, -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7507 current_buffer = saved_current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7508
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7509 /* Center cursor in window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7510 hscroll = (max (0, it.current_x - text_area_width / 2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7511 / CANON_X_UNIT (it.f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7512
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7513 /* Don't call Fset_window_hscroll if value hasn't
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7514 changed because it will prevent redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7515 optimizations. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7516 if (XFASTINT (w->hscroll) != hscroll)
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 Fset_window_hscroll (window, make_number (hscroll));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7519 hscrolled_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7520 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7521 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7524 window = w->next;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7525 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7526
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7527 /* 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
7528 return hscrolled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7529 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7532 /* Set hscroll so that cursor is visible and not inside horizontal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7533 scroll margins for all windows in the tree rooted at WINDOW. See
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7534 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
7535 hscroll has been changed. If it has, desired matrices on the frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7536 of WINDOW are cleared. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7537
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7538 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7539 hscroll_windows (window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7540 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7541 {
28692
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7542 int hscrolled_p;
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7543
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7544 if (automatic_hscrolling_p)
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7545 {
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7546 hscrolled_p = hscroll_window_tree (window);
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7547 if (hscrolled_p)
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7548 clear_desired_matrices (XFRAME (WINDOW_FRAME (XWINDOW (window))));
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7549 }
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7550 else
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7551 hscrolled_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7552 return hscrolled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7553 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7554
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7555
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 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7558 Redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7559 ************************************************************************/
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 /* Variables holding some state of redisplay if GLYPH_DEBUG is defined
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7562 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
7563 session. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7564
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7565 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7566
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7567 /* First and last unchanged row for try_window_id. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7568
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7569 int debug_first_unchanged_at_end_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7570 int debug_last_unchanged_at_beg_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7571
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7572 /* Delta vpos and y. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7573
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7574 int debug_dvpos, debug_dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7575
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7576 /* Delta in characters and bytes for try_window_id. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7577
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7578 int debug_delta, debug_delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7579
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7580 /* 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
7581 try_window_id. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7582
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7583 int debug_end_pos, debug_end_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7584
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7585 /* Append a string to W->desired_matrix->method. FMT is a printf
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7586 format string. A1...A9 are a supplement for a variable-length
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7587 argument list. If trace_redisplay_p is non-zero also printf the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7588 resulting string to stderr. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7591 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
7592 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7593 char *fmt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7594 int a1, a2, a3, a4, a5, a6, a7, a8, a9;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7595 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7596 char buffer[512];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7597 char *method = w->desired_matrix->method;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7598 int len = strlen (method);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7599 int size = sizeof w->desired_matrix->method;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7600 int remaining = size - len - 1;
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 sprintf (buffer, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7603 if (len && remaining)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7604 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7605 method[len] = '|';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7606 --remaining, ++len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7607 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7608
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7609 strncpy (method + len, buffer, remaining);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7610
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7611 if (trace_redisplay_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7612 fprintf (stderr, "%p (%s): %s\n",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7613 w,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7614 ((BUFFERP (w->buffer)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7615 && STRINGP (XBUFFER (w->buffer)->name))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7616 ? (char *) XSTRING (XBUFFER (w->buffer)->name)->data
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7617 : "no buffer"),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7618 buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7619 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7620
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7621 #endif /* GLYPH_DEBUG */
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7624 /* 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
7625 in redisplay_internal. It is incremented for each redisplay.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7626 Every CLEAR_FACE_CACHE_COUNT full redisplays, the face cache is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7627 cleared. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7628
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7629 #define CLEAR_FACE_CACHE_COUNT 10000
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7630 static int clear_face_cache_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7631
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7632 /* Record the previous terminal frame we displayed. */
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 static struct frame *previous_terminal_frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7635
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7636 /* Non-zero while redisplay_internal is in progress. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7637
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7638 int redisplaying_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7639
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7640
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7641 /* Value is non-zero if all changes in window W, which displays
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7642 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
7643 buffer position, END is given as a distance from Z. Used in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7644 redisplay_internal for display optimization. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7645
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7646 static INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7647 text_outside_line_unchanged_p (w, start, end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7648 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7649 int start, end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7650 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7651 int unchanged_p = 1;
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 /* If text or overlays have changed, see where. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7654 if (XFASTINT (w->last_modified) < MODIFF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7655 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7656 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7657 /* Gap in the line? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7658 if (GPT < start || Z - GPT < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7659 unchanged_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7660
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7661 /* Changes start in front of the line, or end after it? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7662 if (unchanged_p
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7663 && (BEG_UNCHANGED < start - 1
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7664 || END_UNCHANGED < end))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7665 unchanged_p = 0;
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 /* If selective display, can't optimize if changes start at the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7668 beginning of the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7669 if (unchanged_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7670 && INTEGERP (current_buffer->selective_display)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7671 && XINT (current_buffer->selective_display) > 0
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7672 && (BEG_UNCHANGED < start || GPT <= start))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7673 unchanged_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7674 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7675
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7676 return unchanged_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7677 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7678
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7679
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7680 /* Do a frame update, taking possible shortcuts into account. This is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7681 the main external entry point for redisplay.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7682
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7683 If the last redisplay displayed an echo area message and that message
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7684 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
7685 mini-buffer if that is in use. */
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 redisplay ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7689 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7690 redisplay_internal (0);
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
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7693 /* Return 1 if point moved out of or into a composition. Otherwise
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7694 return 0. PREV_BUF and PREV_PT are the last point buffer and
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7695 position. BUF and PT are the current point buffer and position. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7696
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7697 int
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7698 check_point_in_composition (prev_buf, prev_pt, buf, pt)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7699 struct buffer *prev_buf, *buf;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7700 int prev_pt, pt;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7701 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7702 int start, end;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7703 Lisp_Object prop;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7704 Lisp_Object buffer;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7705
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7706 XSETBUFFER (buffer, buf);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7707 /* Check a composition at the last point if point moved within the
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7708 same buffer. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7709 if (prev_buf == buf)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7710 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7711 if (prev_pt == pt)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7712 /* Point didn't move. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7713 return 0;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7714
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7715 if (prev_pt > BUF_BEGV (buf) && prev_pt < BUF_ZV (buf)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7716 && find_composition (prev_pt, -1, &start, &end, &prop, buffer)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7717 && COMPOSITION_VALID_P (start, end, prop)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7718 && start < prev_pt && end > prev_pt)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7719 /* The last point was within the composition. Return 1 iff
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7720 point moved out of the composition. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7721 return (pt <= start || pt >= end);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7722 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7723
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7724 /* Check a composition at the current point. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7725 return (pt > BUF_BEGV (buf) && pt < BUF_ZV (buf)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7726 && find_composition (pt, -1, &start, &end, &prop, buffer)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7727 && COMPOSITION_VALID_P (start, end, prop)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7728 && start < pt && end > pt);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7729 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7730
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7731 /* 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
7732 in window W. */
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7733
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7734 static INLINE void
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7735 reconsider_clip_changes (w, b)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7736 struct window *w;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7737 struct buffer *b;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7738 {
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7739 if (b->prevent_redisplay_optimizations_p)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7740 b->clip_changed = 1;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7741 else if (b->clip_changed
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7742 && !NILP (w->window_end_valid)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7743 && w->current_matrix->buffer == b
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7744 && w->current_matrix->zv == BUF_ZV (b)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7745 && w->current_matrix->begv == BUF_BEGV (b))
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7746 b->clip_changed = 0;
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7747
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7748 /* If display wasn't paused, and W is not a tool bar window, see if
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7749 point has been moved into or out of a composition. In that case,
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7750 we set b->clip_changed to 1 to force updating the screen. If
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7751 b->clip_changed has already been set to 1, we can skip this
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7752 check. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7753 if (!b->clip_changed
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7754 && BUFFERP (w->buffer) && !NILP (w->window_end_valid))
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7755 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7756 int pt;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7757
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7758 if (w == XWINDOW (selected_window))
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7759 pt = BUF_PT (current_buffer);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7760 else
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7761 pt = marker_position (w->pointm);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7762
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7763 if ((w->current_matrix->buffer != XBUFFER (w->buffer)
28464
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
7764 || pt != XINT (w->last_point))
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7765 && check_point_in_composition (w->current_matrix->buffer,
28464
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
7766 XINT (w->last_point),
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7767 XBUFFER (w->buffer), pt))
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7768 b->clip_changed = 1;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7769 }
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7770 }
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7771
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7772
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7773 /* 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
7774 response to any user action; therefore, we should preserve the echo
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7775 area. (Actually, our caller does that job.) Perhaps in the future
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7776 avoid recentering windows if it is not necessary; currently that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7777 causes some problems. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
7778
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7779 static void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7780 redisplay_internal (preserve_echo_area)
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
7781 int preserve_echo_area;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7782 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7783 struct window *w = XWINDOW (selected_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7784 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7785 int pause;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7786 int must_finish = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7787 struct text_pos tlbufpos, tlendpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7788 int number_of_visible_frames;
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7789 int count;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7790 struct frame *sf = SELECTED_FRAME ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7791
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7792 /* Non-zero means redisplay has to consider all windows on all
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7793 frames. Zero means, only selected_window is considered. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7794 int consider_all_windows_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7795
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7796 TRACE ((stderr, "redisplay_internal %d\n", redisplaying_p));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7797
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7798 /* 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
7799 initialized, or redisplay is explicitly turned off by setting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7800 Vinhibit_redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7801 if (noninteractive
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7802 || !NILP (Vinhibit_redisplay)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7803 || !f->glyphs_initialized_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7804 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7805
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7806 /* The flag redisplay_performed_directly_p is set by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7807 direct_output_for_insert when it already did the whole screen
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7808 update necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7809 if (redisplay_performed_directly_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7810 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7811 redisplay_performed_directly_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7812 if (!hscroll_windows (selected_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7813 return;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7816 #ifdef USE_X_TOOLKIT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7817 if (popup_activated ())
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7818 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7819 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7820
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7821 /* I don't think this happens but let's be paranoid. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7822 if (redisplaying_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7823 return;
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7824
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7825 /* 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
7826 when we leave this function. */
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
7827 count = BINDING_STACK_SIZE ();
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7828 record_unwind_protect (unwind_redisplay, make_number (redisplaying_p));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7829 ++redisplaying_p;
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7830
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7831 retry:
31170
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
7832 pause = 0;
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7833 reconsider_clip_changes (w, current_buffer);
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7834
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7835 /* If new fonts have been loaded that make a glyph matrix adjustment
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7836 necessary, do it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7837 if (fonts_changed_p)
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 adjust_glyphs (NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7840 ++windows_or_buffers_changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7841 fonts_changed_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7842 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7843
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7844 if (! FRAME_WINDOW_P (sf)
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7845 && previous_terminal_frame != sf)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7846 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7847 /* Since frames on an ASCII terminal share the same display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7848 area, displaying a different frame means redisplay the whole
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7849 thing. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7850 windows_or_buffers_changed++;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7851 SET_FRAME_GARBAGED (sf);
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7852 XSETFRAME (Vterminal_frame, sf);
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7853 }
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7854 previous_terminal_frame = sf;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7855
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7856 /* Set the visible flags for all frames. Do this before checking
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7857 for resized or garbaged frames; they want to know if their frames
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7858 are visible. See the comment in frame.h for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7859 FRAME_SAMPLE_VISIBILITY. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7860 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7861 Lisp_Object tail, frame;
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 number_of_visible_frames = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7864
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7865 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7866 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7867 struct frame *f = XFRAME (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7868
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7869 FRAME_SAMPLE_VISIBILITY (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7870 if (FRAME_VISIBLE_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7871 ++number_of_visible_frames;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7872 clear_desired_matrices (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7873 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7874 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7875
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7876 /* 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
7877 do_pending_window_change (1);
25012
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 /* Clear frames marked as garbaged. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7880 if (frame_garbaged)
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7881 clear_garbaged_frames ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7882
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7883 /* Build menubar and tool-bar items. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7884 prepare_menu_bars ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7885
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7886 if (windows_or_buffers_changed)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7887 update_mode_lines++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7888
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7889 /* 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
7890 if ((SAVE_MODIFF < MODIFF) != !NILP (w->last_had_star))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7891 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7892 w->update_mode_line = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7893 if (buffer_shared > 1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7894 update_mode_lines++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7895 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7896
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7897 /* If %c is in the mode line, update it if needed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7898 if (!NILP (w->column_number_displayed)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7899 /* This alternative quickly identifies a common case
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7900 where no change is needed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7901 && !(PT == XFASTINT (w->last_point)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7902 && XFASTINT (w->last_modified) >= MODIFF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7903 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7904 && XFASTINT (w->column_number_displayed) != current_column ())
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7905 w->update_mode_line = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7906
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7907 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7908
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7909 /* The variable buffer_shared is set in redisplay_window and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7910 indicates that we redisplay a buffer in different windows. See
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7911 there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7912 consider_all_windows_p = update_mode_lines || buffer_shared > 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7913
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7914 /* If specs for an arrow have changed, do thorough redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7915 to ensure we remove any arrow that should no longer exist. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7916 if (! EQ (COERCE_MARKER (Voverlay_arrow_position), last_arrow_position)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7917 || ! EQ (Voverlay_arrow_string, last_arrow_string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7918 consider_all_windows_p = windows_or_buffers_changed = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7919
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7920 /* Normally the message* functions will have already displayed and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7921 updated the echo area, but the frame may have been trashed, or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7922 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
7923 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
7924 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
7925 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
7926 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7927 int window_height_changed_p = echo_area_display (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7928 must_finish = 1;
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
7929
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7930 if (fonts_changed_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7931 goto retry;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7932 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
7933 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7934 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
7935 ++update_mode_lines;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7936 ++windows_or_buffers_changed;
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7937
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7938 /* 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
7939 marked garbaged. Clear them or we will experience
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7940 surprises wrt scrolling. */
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7941 if (frame_garbaged)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7942 clear_garbaged_frames ();
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7943 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7944 }
30942
8f6621d33f0b (redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents: 30761
diff changeset
7945 else if (EQ (selected_window, minibuf_window)
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
7946 && (current_buffer->clip_changed
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
7947 || 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
7948 || 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
7949 && 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
7950 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7951 /* 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
7952 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
7953 must_finish = 1;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
7954 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
7955 ++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
7956 ++update_mode_lines;
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7957
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7958 /* 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
7959 marked garbaged. Clear them or we will experience
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7960 surprises wrt scrolling. */
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7961 if (frame_garbaged)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7962 clear_garbaged_frames ();
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7963 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
7964
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7965
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7966 /* If showing the region, and mark has changed, we must redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7967 the whole window. The assignment to this_line_start_pos prevents
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7968 the optimization directly below this if-statement. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7969 if (((!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7970 && !NILP (XBUFFER (w->buffer)->mark_active))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7971 != !NILP (w->region_showing))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7972 || (!NILP (w->region_showing)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7973 && !EQ (w->region_showing,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7974 Fmarker_position (XBUFFER (w->buffer)->mark))))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7975 CHARPOS (this_line_start_pos) = 0;
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 /* Optimize the case that only the line containing the cursor in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7978 selected window has changed. Variables starting with this_ are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7979 set in display_line and record information about the line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7980 containing the cursor. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7981 tlbufpos = this_line_start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7982 tlendpos = this_line_end_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7983 if (!consider_all_windows_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7984 && CHARPOS (tlbufpos) > 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7985 && NILP (w->update_mode_line)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7986 && !current_buffer->clip_changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7987 && FRAME_VISIBLE_P (XFRAME (w->frame))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7988 && !FRAME_OBSCURED_P (XFRAME (w->frame))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7989 /* Make sure recorded data applies to current buffer, etc. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7990 && this_line_buffer == current_buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7991 && current_buffer == XBUFFER (w->buffer)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7992 && NILP (w->force_start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7993 /* Point must be on the line that we have info recorded about. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7994 && PT >= CHARPOS (tlbufpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7995 && PT <= Z - CHARPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7996 /* All text outside that line, including its final newline,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7997 must be unchanged */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7998 && text_outside_line_unchanged_p (w, CHARPOS (tlbufpos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7999 CHARPOS (tlendpos)))
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 if (CHARPOS (tlbufpos) > BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8002 && FETCH_BYTE (BYTEPOS (tlbufpos) - 1) != '\n'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8003 && (CHARPOS (tlbufpos) == ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8004 || FETCH_BYTE (BYTEPOS (tlbufpos)) == '\n'))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8005 /* Former continuation line has disappeared by becoming empty */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8006 goto cancel;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8007 else if (XFASTINT (w->last_modified) < MODIFF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8008 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8009 || MINI_WINDOW_P (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8010 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8011 /* We have to handle the case of continuation around a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8012 wide-column character (See the comment in indent.c around
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8013 line 885).
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8014
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8015 For instance, in the following case:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8016
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8017 -------- Insert --------
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8018 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
8019 J_I_ ==> J_I_ `^^' are cursors.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8020 ^^ ^^
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8021 -------- --------
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8022
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8023 As we have to redraw the line above, we should goto cancel. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8024
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8025 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8026 int line_height_before = this_line_pixel_height;
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 /* Note that start_display will handle the case that the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8029 line starting at tlbufpos is a continuation lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8030 start_display (&it, w, tlbufpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8031
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8032 /* Implementation note: It this still necessary? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8033 if (it.current_x != this_line_start_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8034 goto cancel;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8035
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8036 TRACE ((stderr, "trying display optimization 1\n"));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8037 w->cursor.vpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8038 overlay_arrow_seen = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8039 it.vpos = this_line_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8040 it.current_y = this_line_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8041 it.glyph_row = MATRIX_ROW (w->desired_matrix, this_line_vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8042 display_line (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8043
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8044 /* If line contains point, is not continued,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8045 and ends at same distance from eob as before, we win */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8046 if (w->cursor.vpos >= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8047 /* Line is not continued, otherwise this_line_start_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8048 would have been set to 0 in display_line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8049 && CHARPOS (this_line_start_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8050 /* Line ends as before. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8051 && CHARPOS (this_line_end_pos) == CHARPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8052 /* Line has same height as before. Otherwise other lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8053 would have to be shifted up or down. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8054 && this_line_pixel_height == line_height_before)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8055 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8056 /* If this is not the window's last line, we must adjust
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8057 the charstarts of the lines below. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8058 if (it.current_y < it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8059 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8060 struct glyph_row *row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8061 = MATRIX_ROW (w->current_matrix, this_line_vpos + 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8062 int delta, delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8063
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8064 if (Z - CHARPOS (tlendpos) == ZV)
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 /* This line ends at end of (accessible part of)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8067 buffer. There is no newline to count. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8068 delta = (Z
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8069 - CHARPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8070 - MATRIX_ROW_START_CHARPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8071 delta_bytes = (Z_BYTE
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8072 - BYTEPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8073 - MATRIX_ROW_START_BYTEPOS (row));
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8076 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8077 /* This line ends in a newline. Must take
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8078 account of the newline and the rest of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8079 text that follows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8080 delta = (Z
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8081 - CHARPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8082 - MATRIX_ROW_START_CHARPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8083 delta_bytes = (Z_BYTE
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8084 - BYTEPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8085 - MATRIX_ROW_START_BYTEPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8086 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8087
28709
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
8088 increment_matrix_positions (w->current_matrix,
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
8089 this_line_vpos + 1,
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
8090 w->current_matrix->nrows,
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
8091 delta, delta_bytes);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8092 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8093
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8094 /* If this row displays text now but previously didn't,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8095 or vice versa, w->window_end_vpos may have to be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8096 adjusted. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8097 if ((it.glyph_row - 1)->displays_text_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8098 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8099 if (XFASTINT (w->window_end_vpos) < this_line_vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8100 XSETINT (w->window_end_vpos, this_line_vpos);
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 else if (XFASTINT (w->window_end_vpos) == this_line_vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8103 && this_line_vpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8104 XSETINT (w->window_end_vpos, this_line_vpos - 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8105 w->window_end_valid = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8106
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8107 /* Update hint: No need to try to scroll in update_window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8108 w->desired_matrix->no_scrolling_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8109
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8110 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8111 *w->desired_matrix->method = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8112 debug_method_add (w, "optimization 1");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8113 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8114 goto update;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8115 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8116 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8117 goto cancel;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8118 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8119 else if (/* Cursor position hasn't changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8120 PT == XFASTINT (w->last_point)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8121 /* Make sure the cursor was last displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8122 in this window. Otherwise we have to reposition it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8123 && 0 <= w->cursor.vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8124 && XINT (w->height) > w->cursor.vpos)
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 if (!must_finish)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8127 {
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8128 do_pending_window_change (1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8129
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8130 /* We used to always goto end_of_redisplay here, but this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8131 isn't enough if we have a blinking cursor. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8132 if (w->cursor_off_p == w->last_cursor_off_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8133 goto end_of_redisplay;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8134 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8135 goto update;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8136 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8137 /* 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
8138 then we can't just move the cursor. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8139 else if (! (!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8140 && !NILP (current_buffer->mark_active))
30942
8f6621d33f0b (redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents: 30761
diff changeset
8141 && (EQ (selected_window, current_buffer->last_selected_window)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8142 || highlight_nonselected_windows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8143 && NILP (w->region_showing)
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
8144 && NILP (Vshow_trailing_whitespace)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8145 && !cursor_in_echo_area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8146 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8147 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8148 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8149
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8150 /* Skip from tlbufpos to PT and see where it is. Note that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8151 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
8152 next visible position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8153 init_iterator (&it, w, CHARPOS (tlbufpos), BYTEPOS (tlbufpos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8154 NULL, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8155 it.current_x = this_line_start_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8156 it.current_y = this_line_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8157 it.vpos = this_line_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8158
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8159 /* The call to move_it_to stops in front of PT, but
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8160 moves over before-strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8161 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8162
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8163 if (it.vpos == this_line_vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8164 && (row = MATRIX_ROW (w->current_matrix, this_line_vpos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8165 row->enabled_p))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8166 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8167 xassert (this_line_vpos == it.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8168 xassert (this_line_y == it.current_y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8169 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
8170 goto update;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8171 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8172 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8173 goto cancel;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8174 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8175
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8176 cancel:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8177 /* Text changed drastically or point moved off of line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8178 SET_MATRIX_ROW_ENABLED_P (w->desired_matrix, this_line_vpos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8179 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8180
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8181 CHARPOS (this_line_start_pos) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8182 consider_all_windows_p |= buffer_shared > 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8183 ++clear_face_cache_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8184
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8185
31170
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8186 /* Build desired matrices, and update the display. If
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8187 consider_all_windows_p is non-zero, do it for all windows on all
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8188 frames. Otherwise do it for selected_window, only. */
25012
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 (consider_all_windows_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8191 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8192 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8193
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8194 /* Clear the face cache eventually. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8195 if (clear_face_cache_count > CLEAR_FACE_CACHE_COUNT)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8196 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8197 clear_face_cache (0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8198 clear_face_cache_count = 0;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8201 /* Recompute # windows showing selected buffer. This will be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8202 incremented each time such a window is displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8203 buffer_shared = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8204
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8205 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8206 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8207 struct frame *f = XFRAME (frame);
31170
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8208
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
8209 if (FRAME_WINDOW_P (f) || f == sf)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8210 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8211 /* Mark all the scroll bars to be removed; we'll redeem
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8212 the ones we want when we redisplay their windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8213 if (condemn_scroll_bars_hook)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8214 (*condemn_scroll_bars_hook) (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8215
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8216 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8217 redisplay_windows (FRAME_ROOT_WINDOW (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8218
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8219 /* Any scroll bars which redisplay_windows should have
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8220 nuked should now go away. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8221 if (judge_scroll_bars_hook)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8222 (*judge_scroll_bars_hook) (f);
31170
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8223
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8224 /* If fonts changed, display again. */
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8225 if (fonts_changed_p)
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8226 goto retry;
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8227
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8228 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f))
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8229 {
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8230 /* See if we have to hscroll. */
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8231 if (hscroll_windows (f->root_window))
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8232 goto retry;
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8233
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8234 /* Prevent various kinds of signals during display
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8235 update. stdio is not robust about handling
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8236 signals, which can cause an apparent I/O
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8237 error. */
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8238 if (interrupt_input)
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8239 unrequest_sigio ();
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8240 stop_polling ();
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8241
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8242 /* Update the display. */
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8243 set_window_update_flags (XWINDOW (f->root_window), 1);
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8244 pause |= update_frame (f, 0, 0);
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8245 if (pause)
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8246 break;
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8247
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8248 mark_window_display_accurate (f->root_window, 1);
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8249 if (frame_up_to_date_hook)
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8250 frame_up_to_date_hook (f);
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8251 }
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8252 }
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8253 }
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8254 }
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8255 else if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf))
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8256 {
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8257 Lisp_Object mini_window;
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8258 struct frame *mini_frame;
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8259
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8260 redisplay_window (selected_window, 1);
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8261
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8262 /* Compare desired and current matrices, perform output. */
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8263 update:
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8264
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8265 /* If fonts changed, display again. */
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8266 if (fonts_changed_p)
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
8267 goto retry;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8268
31170
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8269 /* Prevent various kinds of signals during display update.
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8270 stdio is not robust about handling signals,
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8271 which can cause an apparent I/O error. */
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8272 if (interrupt_input)
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8273 unrequest_sigio ();
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8274 stop_polling ();
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8275
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8276 if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8277 {
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
8278 if (hscroll_windows (selected_window))
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
8279 goto retry;
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
8280
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8281 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
8282 pause = update_frame (sf, 0, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8283 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8284
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8285 /* We may have called echo_area_display at the top of this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8286 function. If the echo area is on another frame, that may
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8287 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
8288 above call to update_frame would not have caught it. Catch
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8289 it here. */
31170
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8290 mini_window = FRAME_MINIBUF_WINDOW (sf);
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8291 mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8292
31170
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8293 if (mini_frame != sf && FRAME_WINDOW_P (mini_frame))
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8294 {
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8295 XWINDOW (mini_window)->must_be_updated_p = 1;
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8296 pause |= update_frame (mini_frame, 0, 0);
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8297 if (!pause && hscroll_windows (mini_window))
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8298 goto retry;
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8299 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8300 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8301
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8302 /* 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
8303 thorough update the next time. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8304 if (pause)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8305 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8306 /* Prevent the optimization at the beginning of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8307 redisplay_internal that tries a single-line update of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8308 line containing the cursor in the selected window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8309 CHARPOS (this_line_start_pos) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8310
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8311 /* Let the overlay arrow be updated the next time. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8312 if (!NILP (last_arrow_position))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8313 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8314 last_arrow_position = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8315 last_arrow_string = Qt;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8318 /* If we pause after scrolling, some rows in the current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8319 matrices of some windows are not valid. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8320 if (!WINDOW_FULL_WIDTH_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8321 && !FRAME_WINDOW_P (XFRAME (w->frame)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8322 update_mode_lines = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8323 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8324
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8325 /* Now text on frame agrees with windows, so put info into the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8326 windows for partial redisplay to follow. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8327 if (!pause)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8328 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8329 register struct buffer *b = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8330
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8331 BUF_UNCHANGED_MODIFIED (b) = BUF_MODIFF (b);
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8332 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
8333 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
8334 BUF_END_UNCHANGED (b) = BUF_Z (b) - BUF_GPT (b);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8335
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8336 if (consider_all_windows_p)
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
8337 mark_window_display_accurate (FRAME_ROOT_WINDOW (sf), 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8338 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8339 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8340 XSETFASTINT (w->last_point, BUF_PT (b));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8341 w->last_cursor = w->cursor;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8342 w->last_cursor_off_p = w->cursor_off_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8343
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8344 b->clip_changed = 0;
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8345 b->prevent_redisplay_optimizations_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8346 w->update_mode_line = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8347 XSETFASTINT (w->last_modified, BUF_MODIFF (b));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8348 XSETFASTINT (w->last_overlay_modified, BUF_OVERLAY_MODIFF (b));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8349 w->last_had_star
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8350 = (BUF_MODIFF (XBUFFER (w->buffer)) > BUF_SAVE_MODIFF (XBUFFER (w->buffer))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8351 ? Qt : Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8352
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8353 /* Record if we are showing a region, so can make sure to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8354 update it fully at next redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8355 w->region_showing = (!NILP (Vtransient_mark_mode)
30942
8f6621d33f0b (redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents: 30761
diff changeset
8356 && (EQ (selected_window,
8f6621d33f0b (redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents: 30761
diff changeset
8357 current_buffer->last_selected_window)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8358 || highlight_nonselected_windows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8359 && !NILP (XBUFFER (w->buffer)->mark_active)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8360 ? Fmarker_position (XBUFFER (w->buffer)->mark)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8361 : Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8362
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8363 w->window_end_valid = w->buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8364 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8365 last_arrow_string = Voverlay_arrow_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8366 if (frame_up_to_date_hook != 0)
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
8367 (*frame_up_to_date_hook) (sf);
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8368
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8369 w->current_matrix->buffer = b;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8370 w->current_matrix->begv = BUF_BEGV (b);
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8371 w->current_matrix->zv = BUF_ZV (b);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8372 }
28206
07ac059dece0 (handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents: 28047
diff changeset
8373
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8374 update_mode_lines = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8375 windows_or_buffers_changed = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8376 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8377
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8378 /* Start SIGIO interrupts coming again. Having them off during the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8379 code above makes it less likely one will discard output, but not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8380 impossible, since there might be stuff in the system buffer here.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8381 But it is much hairier to try to do anything about that. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8382 if (interrupt_input)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8383 request_sigio ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8384 start_polling ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8385
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8386 /* If a frame has become visible which was not before, redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8387 again, so that we display it. Expose events for such a frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8388 (which it gets when becoming visible) don't call the parts of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8389 redisplay constructing glyphs, so simply exposing a frame won't
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8390 display anything in this case. So, we have to display these
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8391 frames here explicitly. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8392 if (!pause)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8393 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8394 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8395 int new_count = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8396
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8397 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8398 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8399 int this_is_visible = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8400
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8401 if (XFRAME (frame)->visible)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8402 this_is_visible = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8403 FRAME_SAMPLE_VISIBILITY (XFRAME (frame));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8404 if (XFRAME (frame)->visible)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8405 this_is_visible = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8406
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8407 if (this_is_visible)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8408 new_count++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8409 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8410
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8411 if (new_count != number_of_visible_frames)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8412 windows_or_buffers_changed++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8413 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8414
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8415 /* 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
8416 do_pending_window_change (1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8417
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8418 /* If we just did a pending size change, or have additional
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8419 visible frames, redisplay again. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8420 if (windows_or_buffers_changed && !pause)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8421 goto retry;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8422
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8423 end_of_redisplay:;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8424
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8425 unbind_to (count, Qnil);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8426 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8427
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8428
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8429 /* Redisplay, but leave alone any recent echo area message unless
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8430 another message has been requested in its place.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8431
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8432 This is useful in situations where you need to redisplay but no
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8433 user action has occurred, making it inappropriate for the message
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8434 area to be cleared. See tracking_off and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8435 wait_reading_process_input for examples of these situations. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8436
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8437 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8438 redisplay_preserve_echo_area ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8439 {
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8440 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
8441 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8442 /* 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
8443 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
8444 display_last_displayed_message_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8445 redisplay_internal (1);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8446 display_last_displayed_message_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8447 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8448 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8449 redisplay_internal (1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8450 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8451
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8452
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8453 /* Function registered with record_unwind_protect in
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8454 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
8455 in progress. */
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8456
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8457 static Lisp_Object
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8458 unwind_redisplay (old_redisplaying_p)
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8459 Lisp_Object old_redisplaying_p;
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8460 {
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8461 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
8462 return Qnil;
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8463 }
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8464
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8465
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8466 /* 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
8467 accurate or inaccurate. If FLAG is non-zero mark display of WINDOW
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8468 as accurate. If FLAG is zero arrange for WINDOW to be redisplayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8469 the next time redisplay_internal is called. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8470
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8471 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8472 mark_window_display_accurate (window, accurate_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8473 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8474 int accurate_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8475 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8476 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8477
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8478 for (; !NILP (window); window = w->next)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8479 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8480 w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8481
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8482 if (BUFFERP (w->buffer))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8483 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8484 struct buffer *b = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8485
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8486 XSETFASTINT (w->last_modified,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8487 accurate_p ? BUF_MODIFF (b) : 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8488 XSETFASTINT (w->last_overlay_modified,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8489 accurate_p ? BUF_OVERLAY_MODIFF (b) : 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8490 w->last_had_star = (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8491 ? Qt : Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8492
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8493 #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
8494 Let's check it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8495 /* Record if we are showing a region, so can make sure to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8496 update it fully at next redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8497 w->region_showing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8498 = (!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8499 && (w == XWINDOW (current_buffer->last_selected_window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8500 || highlight_nonselected_windows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8501 && (!NILP (b->mark_active)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8502 ? Fmarker_position (b->mark)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8503 : Qnil));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8504 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8505
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8506 if (accurate_p)
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 b->clip_changed = 0;
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8509 b->prevent_redisplay_optimizations_p = 0;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8510 w->current_matrix->buffer = b;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8511 w->current_matrix->begv = BUF_BEGV (b);
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8512 w->current_matrix->zv = BUF_ZV (b);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8513 w->last_cursor = w->cursor;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8514 w->last_cursor_off_p = w->cursor_off_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8515 if (w == XWINDOW (selected_window))
28464
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
8516 w->last_point = make_number (BUF_PT (b));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8517 else
28464
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
8518 w->last_point = make_number (XMARKER (w->pointm)->charpos);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8519 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8520 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8521
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8522 w->window_end_valid = w->buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8523 w->update_mode_line = Qnil;
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 if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8526 mark_window_display_accurate (w->vchild, accurate_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8527 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8528 mark_window_display_accurate (w->hchild, accurate_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8529 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8530
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8531 if (accurate_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8532 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8533 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8534 last_arrow_string = Voverlay_arrow_string;
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 else
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 /* Force a thorough redisplay the next time by setting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8539 last_arrow_position and last_arrow_string to t, which is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8540 unequal to any useful value of Voverlay_arrow_... */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8541 last_arrow_position = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8542 last_arrow_string = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8543 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8544 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8545
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8546
17317
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8547 /* 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
8548 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
8549 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
8550 macro DISP_CHAR_VECTOR. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8551
17317
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8552 Lisp_Object
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8553 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
8554 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
8555 int c;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8556 {
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8557 int code[4], i;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8558 Lisp_Object val;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8559
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8560 if (SINGLE_BYTE_CHAR_P (c))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8561 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
8562
29023
af50e87cc257 (get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents: 28984
diff changeset
8563 SPLIT_CHAR (c, code[0], code[1], code[2]);
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
8564 if (code[1] < 32)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
8565 code[1] = -1;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
8566 else if (code[2] < 32)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
8567 code[2] = -1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8568
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8569 /* Here, the possible range of code[0] (== charset ID) is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8570 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
8571 for multibyte characters after 256th element, we must increment
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8572 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
8573 code[0] += 128;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8574 code[3] = -1; /* anchor */
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8575
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8576 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
8577 {
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8578 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
8579 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
8580 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
8581 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8582
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8583 /* 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
8584 it. */
17317
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8585 return (dp->defalt);
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8586 }
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8587
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8588
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8589
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8590 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8591 Window Redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8592 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8593
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8594 /* Redisplay all leaf windows in the window tree rooted at WINDOW. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8595
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8596 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8597 redisplay_windows (window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8598 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8599 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8600 while (!NILP (window))
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 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8603
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8604 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8605 redisplay_windows (w->hchild);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8606 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8607 redisplay_windows (w->vchild);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8608 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8609 redisplay_window (window, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8610
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8611 window = w->next;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8612 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8613 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8614
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8615
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8616 /* 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
8617 DELTA is the number of bytes by which positions recorded in ROW
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8618 differ from current buffer positions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8619
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8620 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8621 set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8622 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8623 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8624 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8625 int delta, delta_bytes, dy, dvpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8626 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8627 struct glyph *glyph = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8628 struct glyph *end = glyph + row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8629 int x = row->x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8630 int pt_old = PT - delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8631
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8632 /* 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
8633 These are special glyphs like truncation marks on terminal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8634 frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8635 if (row->displays_text_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8636 while (glyph < end
28464
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
8637 && INTEGERP (glyph->object)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8638 && glyph->charpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8639 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8640 x += glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8641 ++glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8642 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8643
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8644 while (glyph < end
28464
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
8645 && !INTEGERP (glyph->object)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8646 && (!BUFFERP (glyph->object)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8647 || glyph->charpos < pt_old))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8648 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8649 x += glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8650 ++glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8651 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8652
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8653 w->cursor.hpos = glyph - row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8654 w->cursor.x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8655 w->cursor.vpos = MATRIX_ROW_VPOS (row, matrix) + dvpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8656 w->cursor.y = row->y + dy;
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 if (w == XWINDOW (selected_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8659 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8660 if (!row->continued_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8661 && !MATRIX_ROW_CONTINUATION_LINE_P (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8662 && row->x == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8663 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8664 this_line_buffer = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8665
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8666 CHARPOS (this_line_start_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8667 = MATRIX_ROW_START_CHARPOS (row) + delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8668 BYTEPOS (this_line_start_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8669 = MATRIX_ROW_START_BYTEPOS (row) + delta_bytes;
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 CHARPOS (this_line_end_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8672 = Z - (MATRIX_ROW_END_CHARPOS (row) + delta);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8673 BYTEPOS (this_line_end_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8674 = Z_BYTE - (MATRIX_ROW_END_BYTEPOS (row) + delta_bytes);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8675
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8676 this_line_y = w->cursor.y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8677 this_line_pixel_height = row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8678 this_line_vpos = w->cursor.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8679 this_line_start_x = row->x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8680 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8681 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8682 CHARPOS (this_line_start_pos) = 0;
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8685
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8686
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8687 /* 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
8688 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
8689
385bf7dbf253 (run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents: 25614
diff changeset
8690 We assume that the window's buffer is really current. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8691
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8692 static INLINE struct text_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8693 run_window_scroll_functions (window, startp)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8694 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8695 struct text_pos startp;
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 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8698 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
8699
385bf7dbf253 (run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents: 25614
diff changeset
8700 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
8701 abort ();
385bf7dbf253 (run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents: 25614
diff changeset
8702
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8703 if (!NILP (Vwindow_scroll_functions))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8704 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8705 run_hook_with_args_2 (Qwindow_scroll_functions, window,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8706 make_number (CHARPOS (startp)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8707 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
8708 /* 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
8709 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
8710 set_buffer_internal_1 (XBUFFER (w->buffer));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8711 }
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 return startp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8714 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8717 /* 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
8718 line containing the cursor is fully visible. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
8719
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8720 static void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8721 make_cursor_line_fully_visible (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8722 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8723 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8724 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8725 struct glyph_row *row;
30652
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8726 int window_height, header_line_height;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8727
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8728 /* 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
8729 is full of overlay strings. Don't do anything in that case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8730 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8731 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8732
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8733 matrix = w->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8734 row = MATRIX_ROW (matrix, w->cursor.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8735
30652
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8736 /* If the cursor row is not partially visible, there's nothing
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8737 to do. */
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8738 if (!MATRIX_ROW_PARTIALLY_VISIBLE_P (row))
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8739 return;
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8740
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8741 /* If the row the cursor is in is taller than the window's height,
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8742 it's not clear what to do, so do nothing. */
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8743 window_height = window_box_height (w);
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8744 if (row->height >= window_height)
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8745 return;
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8746
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8747 if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (w, row))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8748 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8749 int dy = row->height - row->visible_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8750 w->vscroll = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8751 w->cursor.y += dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8752 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8753 }
30652
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8754 else /* MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row)) */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8755 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8756 int dy = - (row->height - row->visible_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8757 w->vscroll = dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8758 w->cursor.y += dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8759 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8760 }
30652
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8761
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8762 /* When we change the cursor y-position of the selected window,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8763 change this_line_y as well so that the display optimization for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8764 the cursor line of the selected window in redisplay_internal uses
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8765 the correct y-position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8766 if (w == XWINDOW (selected_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8767 this_line_y = w->cursor.y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8768 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8769
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 /* Try scrolling PT into view in window WINDOW. JUST_THIS_ONE_P
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8772 non-zero means only WINDOW is redisplayed in redisplay_internal.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8773 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
8774 in redisplay_window to bring a partially visible line into view in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8775 the case that only the cursor has moved.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8776
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8777 Value is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8778
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8779 1 if scrolling succeeded
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8780
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8781 0 if scrolling didn't find point.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8782
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8783 -1 if new fonts have been loaded so that we must interrupt
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8784 redisplay, adjust glyph matrices, and try again. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8785
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8786 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8787 try_scrolling (window, just_this_one_p, scroll_conservatively,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8788 scroll_step, temp_scroll_step)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8789 Lisp_Object window;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8790 int just_this_one_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8791 int scroll_conservatively, scroll_step;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8792 int temp_scroll_step;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8793 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8794 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8795 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8796 struct text_pos scroll_margin_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8797 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8798 struct text_pos startp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8799 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8800 Lisp_Object window_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8801 int this_scroll_margin;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8802 int dy = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8803 int scroll_max;
32532
61d4de9a4e35 (try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents: 32460
diff changeset
8804 int rc;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8805 int amount_to_scroll = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8806 Lisp_Object aggressive;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8807 int height;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8808
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8809 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8810 debug_method_add (w, "try_scrolling");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8811 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8812
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8813 SET_TEXT_POS_FROM_MARKER (startp, w->start);
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 /* Compute scroll margin height in pixels. We scroll when point is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8816 within this distance from the top or bottom of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8817 if (scroll_margin > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8818 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8819 this_scroll_margin = min (scroll_margin, XINT (w->height) / 4);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8820 this_scroll_margin *= CANON_Y_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8821 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8822 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8823 this_scroll_margin = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8824
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8825 /* Compute how much we should try to scroll maximally to bring point
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8826 into view. */
33490
b714a06b99ec (try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33462
diff changeset
8827 if (scroll_step || scroll_conservatively || temp_scroll_step)
b714a06b99ec (try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33462
diff changeset
8828 scroll_max = max (scroll_step,
b714a06b99ec (try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33462
diff changeset
8829 max (scroll_conservatively, temp_scroll_step));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8830 else if (NUMBERP (current_buffer->scroll_down_aggressively)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8831 || NUMBERP (current_buffer->scroll_up_aggressively))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8832 /* We're trying to scroll because of aggressive scrolling
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8833 but no scroll_step is set. Choose an arbitrary one. Maybe
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8834 there should be a variable for this. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8835 scroll_max = 10;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8836 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8837 scroll_max = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8838 scroll_max *= CANON_Y_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8839
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8840 /* Decide whether we have to scroll down. Start at the window end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8841 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
8842 margin. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8843 window_end = Fwindow_end (window, Qt);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8844 CHARPOS (scroll_margin_pos) = XINT (window_end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8845 BYTEPOS (scroll_margin_pos) = CHAR_TO_BYTE (CHARPOS (scroll_margin_pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8846 if (this_scroll_margin)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8847 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8848 start_display (&it, w, scroll_margin_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8849 move_it_vertically (&it, - this_scroll_margin);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8850 scroll_margin_pos = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8851 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8852
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8853 if (PT >= CHARPOS (scroll_margin_pos))
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 int y0;
32532
61d4de9a4e35 (try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents: 32460
diff changeset
8856 #if 0
61d4de9a4e35 (try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents: 32460
diff changeset
8857 int line_height;
61d4de9a4e35 (try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents: 32460
diff changeset
8858 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8859
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8860 /* 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
8861 below. Compute a new window start that makes point visible. */
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
8862
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8863 /* Compute the distance from the scroll margin to PT.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8864 Give up if the distance is greater than scroll_max. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8865 start_display (&it, w, scroll_margin_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8866 y0 = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8867 move_it_to (&it, PT, 0, it.last_visible_y, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8868 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y);
32532
61d4de9a4e35 (try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents: 32460
diff changeset
8869 #if 0 /* Taking the line's height into account here looks wrong. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8870 line_height = (it.max_ascent + it.max_descent
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8871 ? it.max_ascent + it.max_descent
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8872 : last_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8873 dy = it.current_y + line_height - y0;
32532
61d4de9a4e35 (try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents: 32460
diff changeset
8874 #else
33074
77c2d2616983 (try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents: 33072
diff changeset
8875 /* With a scroll_margin of 0, scroll_margin_pos is at the window
77c2d2616983 (try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents: 33072
diff changeset
8876 end, which is one line below the window. The iterator's
77c2d2616983 (try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents: 33072
diff changeset
8877 current_y will be same as y0 in that case, but we have to
77c2d2616983 (try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents: 33072
diff changeset
8878 scroll a line to make PT visible. That's the reason why 1 is
77c2d2616983 (try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents: 33072
diff changeset
8879 added below. */
77c2d2616983 (try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents: 33072
diff changeset
8880 dy = 1 + it.current_y - y0;
32532
61d4de9a4e35 (try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents: 32460
diff changeset
8881 #endif
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
8882
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8883 if (dy > scroll_max)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8884 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8885
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8886 /* Move the window start down. If scrolling conservatively,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8887 move it just enough down to make point visible. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8888 scroll_step is set, move it down by scroll_step. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8889 start_display (&it, w, startp);
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 if (scroll_conservatively)
33490
b714a06b99ec (try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33462
diff changeset
8892 amount_to_scroll =
b714a06b99ec (try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33462
diff changeset
8893 max (dy, CANON_Y_UNIT (f) * max (scroll_step, temp_scroll_step));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8894 else if (scroll_step || temp_scroll_step)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8895 amount_to_scroll = scroll_max;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8896 else
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 aggressive = current_buffer->scroll_down_aggressively;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8899 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w)
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
8900 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8901 if (NUMBERP (aggressive))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8902 amount_to_scroll = XFLOATINT (aggressive) * height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8903 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8904
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8905 if (amount_to_scroll <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8906 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8907
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8908 move_it_vertically (&it, amount_to_scroll);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8909 startp = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8910 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8911 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8912 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8913 /* 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
8914 window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8915 scroll_margin_pos = startp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8916 if (this_scroll_margin)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8917 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8918 start_display (&it, w, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8919 move_it_vertically (&it, this_scroll_margin);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8920 scroll_margin_pos = it.current.pos;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8923 if (PT < CHARPOS (scroll_margin_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 /* 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
8926 above what is displayed in the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8927 int y0;
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 /* Compute the vertical distance from PT to the scroll
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8930 margin position. Give up if distance is greater than
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8931 scroll_max. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8932 SET_TEXT_POS (pos, PT, PT_BYTE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8933 start_display (&it, w, pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8934 y0 = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8935 move_it_to (&it, CHARPOS (scroll_margin_pos), 0,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8936 it.last_visible_y, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8937 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8938 dy = it.current_y - y0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8939 if (dy > scroll_max)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8940 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8941
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8942 /* Compute new window start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8943 start_display (&it, w, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8944
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8945 if (scroll_conservatively)
33490
b714a06b99ec (try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33462
diff changeset
8946 amount_to_scroll =
b714a06b99ec (try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33462
diff changeset
8947 max (dy, CANON_Y_UNIT (f) * max (scroll_step, temp_scroll_step));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8948 else if (scroll_step || temp_scroll_step)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8949 amount_to_scroll = scroll_max;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8950 else
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 aggressive = current_buffer->scroll_up_aggressively;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8953 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w)
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
8954 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8955 if (NUMBERP (aggressive))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8956 amount_to_scroll = XFLOATINT (aggressive) * height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8957 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8958
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8959 if (amount_to_scroll <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8960 return 0;
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 move_it_vertically (&it, - amount_to_scroll);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8963 startp = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8964 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8965 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8966
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8967 /* Run window scroll functions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8968 startp = run_window_scroll_functions (window, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8969
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8970 /* 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
8971 doesn't appear. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8972 if (!try_window (window, startp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8973 rc = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8974 else if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8975 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8976 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8977 rc = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8978 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8979 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8980 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8981 /* Maybe forget recorded base line for line number display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8982 if (!just_this_one_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8983 || current_buffer->clip_changed
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8984 || BEG_UNCHANGED < CHARPOS (startp))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8985 w->base_line_number = Qnil;
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 /* If cursor ends up on a partially visible line, shift display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8988 lines up or down. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8989 make_cursor_line_fully_visible (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8990 rc = 1;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8993 return rc;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8994 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8995
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 /* 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
8998 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
8999 was computed.
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 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
9002 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
9003 screen line with the minimum distance from the old start W->start. */
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 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9006 compute_window_start_on_continuation_line (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9007 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9008 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9009 struct text_pos pos, start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9010 int window_start_changed_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9011
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9012 SET_TEXT_POS_FROM_MARKER (start_pos, w->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9013
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9014 /* If window start is on a continuation line... Window start may be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9015 < BEGV in case there's invisible text at the start of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9016 buffer (M-x rmail, for example). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9017 if (CHARPOS (start_pos) > BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9018 && FETCH_BYTE (BYTEPOS (start_pos) - 1) != '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9019 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9020 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9021 struct glyph_row *row;
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
9022
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
9023 /* 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
9024 if (CHARPOS (start_pos) < BEGV)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
9025 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
9026 else if (CHARPOS (start_pos) > ZV)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
9027 SET_TEXT_POS (start_pos, ZV, ZV_BYTE);
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 /* Find the start of the continued line. This should be fast
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9030 because scan_buffer is fast (newline cache). */
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9031 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
9032 init_iterator (&it, w, CHARPOS (start_pos), BYTEPOS (start_pos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9033 row, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9034 reseat_at_previous_visible_line_start (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9035
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9036 /* If the line start is "too far" away from the window start,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9037 say it takes too much time to compute a new window start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9038 if (CHARPOS (start_pos) - IT_CHARPOS (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9039 < XFASTINT (w->height) * XFASTINT (w->width))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9040 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9041 int min_distance, distance;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9042
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9043 /* Move forward by display lines to find the new window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9044 start. If window width was enlarged, the new start can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9045 be expected to be > the old start. If window width was
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9046 decreased, the new window start will be < the old start.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9047 So, we're looking for the display line start with the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9048 minimum distance from the old window start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9049 pos = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9050 min_distance = INFINITY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9051 while ((distance = abs (CHARPOS (start_pos) - IT_CHARPOS (it))),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9052 distance < min_distance)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9053 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9054 min_distance = distance;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9055 pos = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9056 move_it_by_lines (&it, 1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9057 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9058
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9059 /* Set the window start there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9060 SET_MARKER_FROM_TEXT_POS (w->start, pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9061 window_start_changed_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9062 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9063 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9064
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9065 return window_start_changed_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9066 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9067
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9068
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9069 /* Try cursor movement in case text has not changes in window WINDOW,
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9070 with window start STARTP. Value is
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9071
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9072 1 if successful
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9073
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9074 0 if this method cannot be used
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9075
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9076 -1 if we know we have to scroll the display. *SCROLL_STEP is
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9077 set to 1, under certain circumstances, if we want to scroll as
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9078 if scroll-step were set to 1. See the code. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9079
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9080 static int
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9081 try_cursor_movement (window, startp, scroll_step)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9082 Lisp_Object window;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9083 struct text_pos startp;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9084 int *scroll_step;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9085 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9086 struct window *w = XWINDOW (window);
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9087 struct frame *f = XFRAME (w->frame);
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9088 int rc = 0;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9089
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9090 /* Handle case where text has not changed, only point, and it has
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9091 not moved off the frame. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9092 if (/* Point may be in this window. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9093 PT >= CHARPOS (startp)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9094 /* If we don't check this, we are called to move the cursor in a
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9095 horizontally split window with a current matrix that doesn't
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9096 fit the display. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9097 && !windows_or_buffers_changed
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9098 /* Selective display hasn't changed. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9099 && !current_buffer->clip_changed
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9100 /* If force-mode-line-update was called, really redisplay;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9101 that's how redisplay is forced after e.g. changing
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9102 buffer-invisibility-spec. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9103 && NILP (w->update_mode_line)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9104 /* Can't use this case if highlighting a region. When a
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9105 region exists, cursor movement has to do more than just
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9106 set the cursor. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9107 && !(!NILP (Vtransient_mark_mode)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9108 && !NILP (current_buffer->mark_active))
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9109 && NILP (w->region_showing)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9110 && NILP (Vshow_trailing_whitespace)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9111 /* Right after splitting windows, last_point may be nil. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9112 && INTEGERP (w->last_point)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9113 /* This code is not used for mini-buffer for the sake of the case
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9114 of redisplaying to replace an echo area message; since in
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9115 that case the mini-buffer contents per se are usually
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9116 unchanged. This code is of no real use in the mini-buffer
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9117 since the handling of this_line_start_pos, etc., in redisplay
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9118 handles the same cases. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9119 && !EQ (window, minibuf_window)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9120 /* When splitting windows or for new windows, it happens that
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9121 redisplay is called with a nil window_end_vpos or one being
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9122 larger than the window. This should really be fixed in
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9123 window.c. I don't have this on my list, now, so we do
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9124 approximately the same as the old redisplay code. --gerd. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9125 && INTEGERP (w->window_end_vpos)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9126 && XFASTINT (w->window_end_vpos) < w->current_matrix->nrows
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9127 && (FRAME_WINDOW_P (f)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9128 || !MARKERP (Voverlay_arrow_position)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9129 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer))
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9130 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9131 int this_scroll_margin;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9132 struct glyph_row *row;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9133
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9134 #if GLYPH_DEBUG
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9135 debug_method_add (w, "cursor movement");
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9136 #endif
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9137
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9138 /* Scroll if point within this distance from the top or bottom
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9139 of the window. This is a pixel value. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9140 this_scroll_margin = max (0, scroll_margin);
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9141 this_scroll_margin = min (this_scroll_margin, XFASTINT (w->height) / 4);
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9142 this_scroll_margin *= CANON_Y_UNIT (f);
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9143
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9144 /* Start with the row the cursor was displayed during the last
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9145 not paused redisplay. Give up if that row is not valid. */
31170
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
9146 if (w->last_cursor.vpos < 0
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
9147 || w->last_cursor.vpos >= w->current_matrix->nrows)
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9148 rc = -1;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9149 else
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9150 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9151 row = MATRIX_ROW (w->current_matrix, w->last_cursor.vpos);
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9152 if (row->mode_line_p)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9153 ++row;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9154 if (!row->enabled_p)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9155 rc = -1;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9156 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9157
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9158 if (rc == 0)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9159 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9160 int scroll_p = 0;
32592
b15e9539194b (try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents: 32590
diff changeset
9161 int last_y = window_text_bottom_y (w) - this_scroll_margin;
b15e9539194b (try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents: 32590
diff changeset
9162
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9163
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9164 if (PT > XFASTINT (w->last_point))
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9165 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9166 /* Point has moved forward. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9167 while (MATRIX_ROW_END_CHARPOS (row) < PT
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9168 && MATRIX_ROW_BOTTOM_Y (row) < last_y)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9169 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9170 xassert (row->enabled_p);
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9171 ++row;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9172 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9173
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9174 /* The end position of a row equals the start position
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9175 of the next row. If PT is there, we would rather
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
9176 display it in the next line. */
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
9177 while (MATRIX_ROW_BOTTOM_Y (row) < last_y
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
9178 && MATRIX_ROW_END_CHARPOS (row) == PT
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
9179 && !cursor_row_p (w, row))
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
9180 ++row;
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9181
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9182 /* If within the scroll margin, scroll. Note that
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9183 MATRIX_ROW_BOTTOM_Y gives the pixel position at which
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9184 the next line would be drawn, and that
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9185 this_scroll_margin can be zero. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9186 if (MATRIX_ROW_BOTTOM_Y (row) > last_y
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9187 || PT > MATRIX_ROW_END_CHARPOS (row)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9188 /* Line is completely visible last line in window
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9189 and PT is to be set in the next line. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9190 || (MATRIX_ROW_BOTTOM_Y (row) == last_y
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9191 && PT == MATRIX_ROW_END_CHARPOS (row)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9192 && !row->ends_at_zv_p
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9193 && !MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)))
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9194 scroll_p = 1;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9195 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9196 else if (PT < XFASTINT (w->last_point))
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9197 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9198 /* Cursor has to be moved backward. Note that PT >=
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9199 CHARPOS (startp) because of the outer
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9200 if-statement. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9201 while (!row->mode_line_p
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9202 && (MATRIX_ROW_START_CHARPOS (row) > PT
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9203 || (MATRIX_ROW_START_CHARPOS (row) == PT
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9204 && MATRIX_ROW_STARTS_IN_MIDDLE_OF_CHAR_P (row)))
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9205 && (row->y > this_scroll_margin
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9206 || CHARPOS (startp) == BEGV))
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9207 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9208 xassert (row->enabled_p);
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9209 --row;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9210 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9211
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9212 /* Consider the following case: Window starts at BEGV,
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9213 there is invisible, intangible text at BEGV, so that
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9214 display starts at some point START > BEGV. It can
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9215 happen that we are called with PT somewhere between
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9216 BEGV and START. Try to handle that case. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9217 if (row < w->current_matrix->rows
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9218 || row->mode_line_p)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9219 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9220 row = w->current_matrix->rows;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9221 if (row->mode_line_p)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9222 ++row;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9223 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9224
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9225 /* Due to newlines in overlay strings, we may have to
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9226 skip forward over overlay strings. */
32592
b15e9539194b (try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents: 32590
diff changeset
9227 while (MATRIX_ROW_BOTTOM_Y (row) < last_y
b15e9539194b (try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents: 32590
diff changeset
9228 && MATRIX_ROW_END_CHARPOS (row) == PT
b15e9539194b (try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents: 32590
diff changeset
9229 && !cursor_row_p (w, row))
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9230 ++row;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9231
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9232 /* If within the scroll margin, scroll. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9233 if (row->y < this_scroll_margin
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9234 && CHARPOS (startp) != BEGV)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9235 scroll_p = 1;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9236 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9237
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9238 if (PT < MATRIX_ROW_START_CHARPOS (row)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9239 || PT > MATRIX_ROW_END_CHARPOS (row))
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9240 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9241 /* if PT is not in the glyph row, give up. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9242 rc = -1;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9243 }
30761
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9244 else if (MATRIX_ROW_PARTIALLY_VISIBLE_P (row))
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9245 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9246 /* If we end up in a partially visible line, let's make it
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9247 fully visible, except when it's taller than the window,
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9248 in which case we can't do much about it. */
30761
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9249 if (row->height > window_box_height (w))
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9250 {
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9251 *scroll_step = 1;
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9252 rc = -1;
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9253 }
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9254 else
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9255 {
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9256 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9257 try_window (window, startp);
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9258 make_cursor_line_fully_visible (w);
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9259 rc = 1;
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9260 }
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9261 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9262 else if (scroll_p)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9263 rc = -1;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9264 else
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9265 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9266 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9267 rc = 1;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9268 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9269 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9270 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9271
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9272 return rc;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9273 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9274
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9275
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9276 /* Redisplay leaf window WINDOW. JUST_THIS_ONE_P non-zero means only
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9277 selected_window is redisplayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9278
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9279 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9280 redisplay_window (window, just_this_one_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9281 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9282 int just_this_one_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9283 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9284 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9285 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9286 struct buffer *buffer = XBUFFER (w->buffer);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9287 struct buffer *old = current_buffer;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9288 struct text_pos lpoint, opoint, startp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9289 int update_mode_line;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9290 int tem;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9291 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9292 /* Record it now because it's overwritten. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9293 int current_matrix_up_to_date_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9294 int temp_scroll_step = 0;
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
9295 int count = BINDING_STACK_SIZE ();
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9296 int rc;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9297
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9298 SET_TEXT_POS (lpoint, PT, PT_BYTE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9299 opoint = lpoint;
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 /* W must be a leaf window here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9302 xassert (!NILP (w->buffer));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9303 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9304 *w->desired_matrix->method = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9305 #endif
21748
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
9306
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
9307 specbind (Qinhibit_point_motion_hooks, Qt);
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9308
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9309 reconsider_clip_changes (w, buffer);
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9310
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9311 /* Has the mode line to be updated? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9312 update_mode_line = (!NILP (w->update_mode_line)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9313 || update_mode_lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9314 || buffer->clip_changed);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
9315
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
9316 if (MINI_WINDOW_P (w))
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
9317 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9318 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
9319 && !NILP (echo_area_buffer[0]))
25012
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 if (update_mode_line)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9322 /* 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
9323 tool-bar. Example `M-x C-h C-h C-g'. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9324 goto finish_menu_bars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9325 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9326 /* We've already displayed the echo area glyphs in this window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9327 goto finish_scroll_bars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9328 }
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
9329 else if (w != XWINDOW (minibuf_window))
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
9330 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9331 /* W is a mini-buffer window, but it's not the currently
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9332 active one, so clear it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9333 int yb = window_text_bottom_y (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9334 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9335 int y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9336
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9337 for (y = 0, row = w->desired_matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9338 y < yb;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9339 y += row->height, ++row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9340 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
9341 goto finish_scroll_bars;
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
9342 }
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
9343 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9344
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9345 /* Otherwise set up data on this window; select its buffer and point
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9346 value. */
29445
cb3ad8f8f0ed (redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents: 29433
diff changeset
9347 /* Really select the buffer, for the sake of buffer-local
cb3ad8f8f0ed (redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents: 29433
diff changeset
9348 variables. */
cb3ad8f8f0ed (redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents: 29433
diff changeset
9349 set_buffer_internal_1 (XBUFFER (w->buffer));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9350 SET_TEXT_POS (opoint, PT, PT_BYTE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9351
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9352 current_matrix_up_to_date_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9353 = (!NILP (w->window_end_valid)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9354 && !current_buffer->clip_changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9355 && XFASTINT (w->last_modified) >= MODIFF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9356 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9357
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9358 /* 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
9359 the window end being valid, so set it to nil there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9360 if (windows_or_buffers_changed)
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 /* If window starts on a continuation line, maybe adjust the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9363 window start in case the window's width changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9364 if (XMARKER (w->start)->buffer == current_buffer)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9365 compute_window_start_on_continuation_line (w);
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 w->window_end_valid = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9368 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9369
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9370 /* Some sanity checks. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9371 CHECK_WINDOW_END (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9372 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
9373 abort ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9374 if (BYTEPOS (opoint) < CHARPOS (opoint))
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
9375 abort ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9376
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
9377 /* 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
9378 if (!NILP (w->column_number_displayed)
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
9379 /* This alternative quickly identifies a common case
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
9380 where no change is needed. */
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
9381 && !(PT == XFASTINT (w->last_point)
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
9382 && XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
9383 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
9384 && XFASTINT (w->column_number_displayed) != current_column ())
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
9385 update_mode_line = 1;
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
9386
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9387 /* Count number of windows showing the selected buffer. An indirect
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9388 buffer counts as its base buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9389 if (!just_this_one_p)
10303
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9390 {
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9391 struct buffer *current_base, *window_base;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9392 current_base = current_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9393 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
9394 if (current_base->base_buffer)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9395 current_base = current_base->base_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9396 if (window_base->base_buffer)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9397 window_base = window_base->base_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9398 if (current_base == window_base)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9399 buffer_shared++;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9400 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9401
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9402 /* Point refers normally to the selected window. For any other
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9403 window, set up appropriate value. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9404 if (!EQ (window, selected_window))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9405 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
9406 int new_pt = XMARKER (w->pointm)->charpos;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
9407 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
9408 if (new_pt < BEGV)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9409 {
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
9410 new_pt = BEGV;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
9411 new_pt_byte = BEGV_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
9412 set_marker_both (w->pointm, Qnil, BEGV, BEGV_BYTE);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9413 }
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
9414 else if (new_pt > (ZV - 1))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9415 {
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
9416 new_pt = ZV;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
9417 new_pt_byte = ZV_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
9418 set_marker_both (w->pointm, Qnil, ZV, ZV_BYTE);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9419 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9420
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
9421 /* 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
9422 TEMP_SET_PT_BOTH (new_pt, new_pt_byte);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9423 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9424
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
9425 /* If any of the character widths specified in the display table
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9426 have changed, invalidate the width run cache. It's true that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9427 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
9428 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
9429 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
9430 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
9431 {
13188
dc0909e788bd (redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 13104
diff changeset
9432 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
9433
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
9434 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
9435 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
9436 {
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
9437 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
9438 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
9439 BEG, Z);
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
9440 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
9441 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
9442 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
9443
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9444 /* If window-start is screwed up, choose a new one. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9445 if (XMARKER (w->start)->buffer != current_buffer)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9446 goto recenter;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9447
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9448 SET_TEXT_POS_FROM_MARKER (startp, w->start);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9449
16554
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
9450 /* 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
9451 check whether it can be used. */
26908
c5079639cac1 (redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents: 26874
diff changeset
9452 if (!NILP (w->optional_new_start)
c5079639cac1 (redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents: 26874
diff changeset
9453 && CHARPOS (startp) >= BEGV
c5079639cac1 (redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents: 26874
diff changeset
9454 && CHARPOS (startp) <= ZV)
16554
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
9455 {
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
9456 w->optional_new_start = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9457 start_display (&it, w, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9458 move_it_to (&it, PT, 0, it.last_visible_y, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9459 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9460 if (IT_CHARPOS (it) == PT)
16554
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
9461 w->force_start = Qt;
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
9462 }
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
9463
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
9464 /* 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
9465 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
9466 if (!NILP (w->force_start)
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
9467 || w->frozen_window_start_p)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9468 {
13833
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
9469 w->force_start = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9470 w->vscroll = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9471 w->window_end_valid = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9472
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9473 /* Forget any recorded base line for line number display. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9474 if (!current_matrix_up_to_date_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9475 || current_buffer->clip_changed)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9476 w->base_line_number = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9477
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
9478 /* 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
9479 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
9480 because we have scrolled. */
13833
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
9481 /* 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
9482 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
9483 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
9484 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
9485 if (!update_mode_line
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
9486 || ! NILP (Vwindow_scroll_functions))
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9487 {
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9488 update_mode_line = 1;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9489 w->update_mode_line = Qt;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9490 startp = run_window_scroll_functions (window, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9491 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9492
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
9493 XSETFASTINT (w->last_modified, 0);
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
9494 XSETFASTINT (w->last_overlay_modified, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9495 if (CHARPOS (startp) < BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9496 SET_TEXT_POS (startp, BEGV, BEGV_BYTE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9497 else if (CHARPOS (startp) > ZV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9498 SET_TEXT_POS (startp, ZV, ZV_BYTE);
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 /* Redisplay, then check if cursor has been set during the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9501 redisplay. Give up if new fonts were loaded. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9502 if (!try_window (window, startp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9503 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9504 w->force_start = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9505 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9506 goto restore_buffers;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9507 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9508
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
9509 if (w->cursor.vpos < 0 && !w->frozen_window_start_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9510 {
30652
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
9511 /* If point does not appear, try to move point so it does
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
9512 appear. The desired matrix has been built above, so we
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
9513 can use it here. */
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
9514 int window_height;
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
9515 struct glyph_row *row;
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
9516
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
9517 window_height = window_box_height (w) / 2;
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
9518 row = MATRIX_FIRST_TEXT_ROW (w->desired_matrix);
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
9519 while (MATRIX_ROW_BOTTOM_Y (row) < window_height)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9520 ++row;
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 TEMP_SET_PT_BOTH (MATRIX_ROW_START_CHARPOS (row),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9523 MATRIX_ROW_START_BYTEPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9524
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
9525 if (w != XWINDOW (selected_window))
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
9526 set_marker_both (w->pointm, Qnil, PT, PT_BYTE);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9527 else if (current_buffer == old)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9528 SET_TEXT_POS (lpoint, PT, PT_BYTE);
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 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
9531
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9532 /* If we are highlighting the region, then we just changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9533 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
9534 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
9535 && !NILP (current_buffer->mark_active))
9420
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
9536 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9537 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9538 if (!try_window (window, startp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9539 goto restore_buffers;
9420
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
9540 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9541 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9542
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9543 make_cursor_line_fully_visible (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9544 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9545 debug_method_add (w, "forced window start");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9546 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9547 goto done;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9548 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9549
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9550 /* Handle case where text has not changed, only point, and it has
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9551 not moved off the frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9552 if (current_matrix_up_to_date_p
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9553 && (rc = try_cursor_movement (window, startp, &temp_scroll_step),
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9554 rc != 0))
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9555 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9556 if (rc == -1)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9557 goto try_to_scroll;
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9558 else
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9559 goto done;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9560 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9561 /* If current starting point was originally the beginning of a line
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9562 but no longer is, find a new starting point. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
9563 else if (!NILP (w->start_at_line_beg)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9564 && !(CHARPOS (startp) <= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9565 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n'))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9566 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9567 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9568 debug_method_add (w, "recenter 1");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9569 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9570 goto recenter;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9571 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9572
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9573 /* Try scrolling with try_window_id. */
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9574 else if (/* Windows and buffers haven't changed. */
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9575 !windows_or_buffers_changed
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9576 /* Window must be either use window-based redisplay or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9577 be full width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9578 && (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
9579 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w)))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9580 && !MINI_WINDOW_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9581 /* Point is not known NOT to appear in window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9582 && PT >= CHARPOS (startp)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9583 && XFASTINT (w->last_modified)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9584 /* Window is not hscrolled. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9585 && XFASTINT (w->hscroll) == 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9586 /* Selective display has not changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9587 && !current_buffer->clip_changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9588 /* Current matrix is up to date. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9589 && !NILP (w->window_end_valid)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9590 /* Can't use this case if highlighting a region because
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9591 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
9592 && !(!NILP (Vtransient_mark_mode)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
9593 && !NILP (current_buffer->mark_active))
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
9594 && NILP (w->region_showing)
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
9595 && NILP (Vshow_trailing_whitespace)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9596 /* Overlay arrow position and string not changed. */
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
9597 && EQ (last_arrow_position, COERCE_MARKER (Voverlay_arrow_position))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9598 && EQ (last_arrow_string, Voverlay_arrow_string)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9599 /* 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
9600 know that the same window start will not work. It is 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9601 if unsuccessful for some other reason. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9602 && (tem = try_window_id (w)) != 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9603 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9604 #if GLYPH_DEBUG
30136
8dc78ef485a4 (try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents: 29981
diff changeset
9605 debug_method_add (w, "try_window_id %d", tem);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9606 #endif
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 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9609 goto restore_buffers;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9610 if (tem > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9611 goto done;
30136
8dc78ef485a4 (try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents: 29981
diff changeset
9612
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9613 /* Otherwise try_window_id has returned -1 which means that we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9614 don't want the alternative below this comment to execute. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9615 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9616 else if (CHARPOS (startp) >= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9617 && CHARPOS (startp) <= ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9618 && PT >= CHARPOS (startp)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9619 && (CHARPOS (startp) < ZV
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
9620 /* Avoid starting at end of buffer. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9621 || CHARPOS (startp) == BEGV
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
9622 || (XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
9623 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9624 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9625 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9626 debug_method_add (w, "same window start");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9627 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9628
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9629 /* Try to redisplay starting at same place as before.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9630 If point has not moved off frame, accept the results. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9631 if (!current_matrix_up_to_date_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9632 /* Don't use try_window_reusing_current_matrix in this case
28206
07ac059dece0 (handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents: 28047
diff changeset
9633 because a window scroll function can have changed the
07ac059dece0 (handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents: 28047
diff changeset
9634 buffer. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9635 || !NILP (Vwindow_scroll_functions)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9636 || MINI_WINDOW_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9637 || !try_window_reusing_current_matrix (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9638 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9639 IF_DEBUG (debug_method_add (w, "1"));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9640 try_window (window, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9641 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9642
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9643 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9644 goto restore_buffers;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9645
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9646 if (w->cursor.vpos >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9647 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9648 if (!just_this_one_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9649 || current_buffer->clip_changed
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9650 || BEG_UNCHANGED < CHARPOS (startp))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9651 /* 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
9652 w->base_line_number = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9653
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9654 make_cursor_line_fully_visible (w);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9655 goto done;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9656 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9657 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9658 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9659 }
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 try_to_scroll:
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9662
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
9663 XSETFASTINT (w->last_modified, 0);
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
9664 XSETFASTINT (w->last_overlay_modified, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9665
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9666 /* 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
9667 if (!update_mode_line)
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9668 {
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9669 update_mode_line = 1;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9670 w->update_mode_line = Qt;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9671 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9672
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9673 /* Try to scroll by specified few lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9674 if ((scroll_conservatively
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9675 || scroll_step
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9676 || temp_scroll_step
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9677 || NUMBERP (current_buffer->scroll_up_aggressively)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9678 || 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
9679 && !current_buffer->clip_changed
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9680 && CHARPOS (startp) >= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9681 && CHARPOS (startp) <= ZV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9682 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9683 /* The function returns -1 if new fonts were loaded, 1 if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9684 successful, 0 if not successful. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9685 int rc = try_scrolling (window, just_this_one_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9686 scroll_conservatively,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9687 scroll_step,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9688 temp_scroll_step);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9689 if (rc > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9690 goto done;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9691 else if (rc < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9692 goto restore_buffers;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9693 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9694
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9695 /* Finally, just choose place to start which centers point */
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 recenter:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9698
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9699 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9700 debug_method_add (w, "recenter");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9701 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9702
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9703 /* w->vscroll = 0; */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9704
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9705 /* Forget any previously recorded base line for line number display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9706 if (!current_matrix_up_to_date_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9707 || current_buffer->clip_changed)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9708 w->base_line_number = Qnil;
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 /* Move backward half the height of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9711 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9712 it.current_y = it.last_visible_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9713 move_it_vertically_backward (&it, it.last_visible_y / 2);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9714 xassert (IT_CHARPOS (it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9715
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9716 /* The function move_it_vertically_backward may move over more
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9717 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
9718 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
9719 display area. Start displaying at the start of the line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9720 containing PT in this case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9721 if (it.current_y <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9722 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9723 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9724 move_it_vertically (&it, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9725 xassert (IT_CHARPOS (it) <= PT);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9726 it.current_y = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9727 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9728
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9729 it.current_x = it.hpos = 0;
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 /* Set startp here explicitly in case that helps avoid an infinite loop
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9732 in case the window-scroll-functions functions get errors. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9733 set_marker_both (w->start, Qnil, IT_CHARPOS (it), IT_BYTEPOS (it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9734
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9735 /* Run scroll hooks. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9736 startp = run_window_scroll_functions (window, it.current.pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9737
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9738 /* Redisplay the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9739 if (!current_matrix_up_to_date_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9740 || windows_or_buffers_changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9741 /* Don't use try_window_reusing_current_matrix in this case
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9742 because it can have changed the buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9743 || !NILP (Vwindow_scroll_functions)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9744 || !just_this_one_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9745 || MINI_WINDOW_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9746 || !try_window_reusing_current_matrix (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9747 try_window (window, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9748
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9749 /* If new fonts have been loaded (due to fontsets), give up. We
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9750 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
9751 matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9752 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9753 goto restore_buffers;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9754
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9755 /* 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
9756 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
9757 (Imagine a window of height 100, displaying two lines of height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9758 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
9759 line.) */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9760 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9761 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9762 if (!NILP (w->window_end_valid)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9763 && PT >= Z - XFASTINT (w->window_end_pos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9764 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9765 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9766 move_it_by_lines (&it, 1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9767 try_window (window, it.current.pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9768 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9769 else if (PT < IT_CHARPOS (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9770 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9771 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9772 move_it_by_lines (&it, -1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9773 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
9774 }
21845
1bae35c78db2 (redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents: 21825
diff changeset
9775 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9776 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9777 /* Not much we can do about it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9778 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9779 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9780
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9781 /* Consider the following case: Window starts at BEGV, there is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9782 invisible, intangible text at BEGV, so that display starts at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9783 some point START > BEGV. It can happen that we are called with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9784 PT somewhere between BEGV and START. Try to handle that case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9785 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9786 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9787 struct glyph_row *row = w->current_matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9788 if (row->mode_line_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9789 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9790 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
9791 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9792
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9793 make_cursor_line_fully_visible (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9794
25695
9e6edb8bc242 (redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents: 25693
diff changeset
9795 done:
9e6edb8bc242 (redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents: 25693
diff changeset
9796
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9797 SET_TEXT_POS_FROM_MARKER (startp, w->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9798 w->start_at_line_beg = ((CHARPOS (startp) == BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9799 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9800 ? Qt : Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9801
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9802 /* 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
9803 if ((update_mode_line
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9804 /* If window not full width, must redo its mode line
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9805 if (a) the window to its side is being redone and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9806 (b) we do a frame-based redisplay. This is a consequence
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9807 of how inverted lines are drawn in frame-based redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9808 || (!just_this_one_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9809 && !FRAME_WINDOW_P (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9810 && !WINDOW_FULL_WIDTH_P (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9811 /* 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
9812 || INTEGERP (w->base_line_pos)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9813 /* 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
9814 || (!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
9815 && XFASTINT (w->column_number_displayed) != current_column ()))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9816 /* This means that the window has a mode line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9817 && (WINDOW_WANTS_MODELINE_P (w)
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9818 || WINDOW_WANTS_HEADER_LINE_P (w)))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9819 {
29291
4849a9a666ab (redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents: 29191
diff changeset
9820 Lisp_Object old_selected_frame;
4849a9a666ab (redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents: 29191
diff changeset
9821
4849a9a666ab (redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents: 29191
diff changeset
9822 old_selected_frame = selected_frame;
4849a9a666ab (redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents: 29191
diff changeset
9823
4849a9a666ab (redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents: 29191
diff changeset
9824 XSETFRAME (selected_frame, f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9825 display_mode_lines (w);
29291
4849a9a666ab (redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents: 29191
diff changeset
9826 selected_frame = old_selected_frame;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9827
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9828 /* If mode line height has changed, arrange for a thorough
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9829 immediate redisplay using the correct mode line height. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9830 if (WINDOW_WANTS_MODELINE_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9831 && CURRENT_MODE_LINE_HEIGHT (w) != DESIRED_MODE_LINE_HEIGHT (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9832 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9833 fonts_changed_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9834 MATRIX_MODE_LINE_ROW (w->current_matrix)->height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9835 = DESIRED_MODE_LINE_HEIGHT (w);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9838 /* If top line height has changed, arrange for a thorough
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9839 immediate redisplay using the correct mode line height. */
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9840 if (WINDOW_WANTS_HEADER_LINE_P (w)
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9841 && CURRENT_HEADER_LINE_HEIGHT (w) != DESIRED_HEADER_LINE_HEIGHT (w))
25012
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 fonts_changed_p = 1;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9844 MATRIX_HEADER_LINE_ROW (w->current_matrix)->height
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9845 = DESIRED_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9846 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9847
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9848 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9849 goto restore_buffers;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9850 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9851
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9852 if (!line_number_displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9853 && !BUFFERP (w->base_line_pos))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9854 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9855 w->base_line_pos = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9856 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9857 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9858
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9859 finish_menu_bars:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9860
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
9861 /* 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
9862 if (update_mode_line
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9863 && EQ (FRAME_SELECTED_WINDOW (f), window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9864 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9865 int redisplay_menu_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9866
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9867 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9868 {
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
9869 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9870 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
9871 #else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9872 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
9873 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9874 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9875 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9876 redisplay_menu_p = FRAME_MENU_BAR_LINES (f) > 0;
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 if (redisplay_menu_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9879 display_menu_bar (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9880
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9881 #ifdef HAVE_WINDOW_SYSTEM
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9882 if (WINDOWP (f->tool_bar_window)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9883 && (FRAME_TOOL_BAR_LINES (f) > 0
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9884 || auto_resize_tool_bars_p))
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
9885 redisplay_tool_bar (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9886 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9887 }
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
9888
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
9889 finish_scroll_bars:
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9890
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
9891 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
9892 {
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9893 int start, end, whole;
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9894
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9895 /* 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
9896 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
9897 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
9898 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
9899 visible region.
80805283464a * xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents: 2848
diff changeset
9900
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9901 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
9902 if (!MINI_WINDOW_P (w)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9903 || (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
9904 && 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
9905 {
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
9906 whole = ZV - BEGV;
11108
ad6e21535db6 (redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents: 11085
diff changeset
9907 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
9908 /* 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
9909 moment, we'll pretend it is. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9910 end = (Z - XFASTINT (w->window_end_pos)) - BEGV;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9911
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9912 if (end < start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9913 end = start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9914 if (whole < (end - start))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9915 whole = end - start;
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9916 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9917 else
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9918 start = end = whole = 0;
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9919
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
9920 /* 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
9921 (*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
9922
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9923 /* Note that we actually used the scroll bar attached to this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9924 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
9925 (*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
9926 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
9927
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9928 restore_buffers:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9929
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9930 /* Restore current_buffer and value of point in it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9931 TEMP_SET_PT_BOTH (CHARPOS (opoint), BYTEPOS (opoint));
29445
cb3ad8f8f0ed (redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents: 29433
diff changeset
9932 set_buffer_internal_1 (old);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9933 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
9934
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
9935 unbind_to (count, Qnil);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9936 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9937
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9938
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9939 /* Build the complete desired matrix of WINDOW with a window start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9940 buffer position POS. Value is non-zero if successful. It is zero
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9941 if fonts were loaded during redisplay which makes re-adjusting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9942 glyph matrices necessary. */
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 int
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9945 try_window (window, pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9946 Lisp_Object window;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9947 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9948 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9949 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9950 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9951 struct glyph_row *last_text_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9952
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9953 /* Make POS the new window start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9954 set_marker_both (w->start, Qnil, CHARPOS (pos), BYTEPOS (pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9955
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9956 /* Mark cursor position as unknown. No overlay arrow seen. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9957 w->cursor.vpos = -1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9958 overlay_arrow_seen = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9959
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9960 /* Initialize iterator and info to start at POS. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9961 start_display (&it, w, pos);
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 /* Display all lines of W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9964 while (it.current_y < it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9965 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9966 if (display_line (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9967 last_text_row = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9968 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9969 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9970 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9971
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9972 /* If bottom moved off end of frame, change mode line percentage. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9973 if (XFASTINT (w->window_end_pos) <= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9974 && Z != IT_CHARPOS (it))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9975 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9976
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9977 /* Set window_end_pos to the offset of the last character displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9978 on the window from the end of current_buffer. Set
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9979 window_end_vpos to its row number. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9980 if (last_text_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 xassert (MATRIX_ROW_DISPLAYS_TEXT_P (last_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9983 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9984 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9985 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9986 Z - MATRIX_ROW_END_CHARPOS (last_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9987 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9988 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9989 xassert (MATRIX_ROW (w->desired_matrix, XFASTINT (w->window_end_vpos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9990 ->displays_text_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9991 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9992 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9993 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9994 w->window_end_bytepos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9995 XSETFASTINT (w->window_end_pos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9996 XSETFASTINT (w->window_end_vpos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9997 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9998
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9999 /* But that is not valid info until redisplay finishes. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10000 w->window_end_valid = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10001 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10002 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10003
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10004
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10005
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10006 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10007 Window redisplay reusing current matrix when buffer has not changed
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 /* Try redisplay of window W showing an unchanged buffer with a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10011 different window start than the last time it was displayed by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10012 reusing its current matrix. Value is non-zero if successful.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10013 W->start is the new window start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10014
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10015 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10016 try_window_reusing_current_matrix (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10017 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10018 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10019 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10020 struct glyph_row *row, *bottom_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10021 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10022 struct run run;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10023 struct text_pos start, new_start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10024 int nrows_scrolled, i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10025 struct glyph_row *last_text_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10026 struct glyph_row *last_reused_text_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10027 struct glyph_row *start_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10028 int start_vpos, min_y, max_y;
29981
e4256ac89b92 (try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents: 29960
diff changeset
10029
e4256ac89b92 (try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents: 29960
diff changeset
10030 if (/* This function doesn't handle terminal frames. */
e4256ac89b92 (try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents: 29960
diff changeset
10031 !FRAME_WINDOW_P (f)
e4256ac89b92 (try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents: 29960
diff changeset
10032 /* Don't try to reuse the display if windows have been split
e4256ac89b92 (try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents: 29960
diff changeset
10033 or such. */
e4256ac89b92 (try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents: 29960
diff changeset
10034 || windows_or_buffers_changed)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10035 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10036
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10037 /* Can't do this if region may have changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10038 if ((!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10039 && !NILP (current_buffer->mark_active))
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
10040 || !NILP (w->region_showing)
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
10041 || !NILP (Vshow_trailing_whitespace))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10042 return 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 /* If top-line visibility has changed, give up. */
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10045 if (WINDOW_WANTS_HEADER_LINE_P (w)
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10046 != MATRIX_HEADER_LINE_ROW (w->current_matrix)->mode_line_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10047 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10048
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10049 /* Give up if old or new display is scrolled vertically. We could
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10050 make this function handle this, but right now it doesn't. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10051 start_row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10052 if (w->vscroll || MATRIX_ROW_PARTIALLY_VISIBLE_P (start_row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10053 return 0;
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 /* The variable new_start now holds the new window start. The old
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10056 start `start' can be determined from the current matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10057 SET_TEXT_POS_FROM_MARKER (new_start, w->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10058 start = start_row->start.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10059 start_vpos = MATRIX_ROW_VPOS (start_row, w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10060
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10061 /* Clear the desired matrix for the display below. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10062 clear_glyph_matrix (w->desired_matrix);
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 if (CHARPOS (new_start) <= CHARPOS (start))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10065 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10066 int first_row_y;
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 IF_DEBUG (debug_method_add (w, "twu1"));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10069
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10070 /* Display up to a row that can be reused. The variable
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10071 last_text_row is set to the last row displayed that displays
31849
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10072 text. Note that it.vpos == 0 if or if not there is a
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10073 header-line; it's not the same as the MATRIX_ROW_VPOS! */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10074 start_display (&it, w, new_start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10075 first_row_y = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10076 w->cursor.vpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10077 last_text_row = last_reused_text_row = NULL;
31849
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10078
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10079 while (it.current_y < it.last_visible_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10080 && IT_CHARPOS (it) < CHARPOS (start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10081 && !fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10082 if (display_line (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10083 last_text_row = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10084
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10085 /* A value of current_y < last_visible_y means that we stopped
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10086 at the previous window start, which in turn means that we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10087 have at least one reusable row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10088 if (it.current_y < it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10089 {
31849
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10090 /* IT.vpos always starts from 0; it counts text lines. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10091 nrows_scrolled = it.vpos;
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 /* Find PT if not already found in the lines displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10094 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10095 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10096 int dy = it.current_y - first_row_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10097
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10098 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10099 while (MATRIX_ROW_DISPLAYS_TEXT_P (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10100 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10101 if (PT >= MATRIX_ROW_START_CHARPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10102 && PT < MATRIX_ROW_END_CHARPOS (row))
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 set_cursor_from_row (w, row, w->current_matrix, 0, 0,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10105 dy, nrows_scrolled);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10106 break;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10109 if (MATRIX_ROW_BOTTOM_Y (row) + dy >= it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10110 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10111
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10112 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10113 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10114
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10115 /* Give up if point was not found. This shouldn't
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10116 happen often; not more often than with try_window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10117 itself. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10118 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10119 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10120 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10121 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10122 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10125 /* Scroll the display. Do it before the current matrix is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10126 changed. The problem here is that update has not yet
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10127 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
10128 scroll_run_hook will clear the cursor, and use the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10129 current matrix to get the height of the row the cursor is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10130 in. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10131 run.current_y = first_row_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10132 run.desired_y = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10133 run.height = it.last_visible_y - it.current_y;
31849
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10134
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10135 if (run.height > 0 && run.current_y != run.desired_y)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10136 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10137 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10138 rif->update_window_begin_hook (w);
30159
1b0331a7c724 (try_window_reusing_current_matrix, try_window_id):
Gerd Moellmann <gerd@gnu.org>
parents: 30136
diff changeset
10139 rif->clear_mouse_face (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10140 rif->scroll_run_hook (w, &run);
30159
1b0331a7c724 (try_window_reusing_current_matrix, try_window_id):
Gerd Moellmann <gerd@gnu.org>
parents: 30136
diff changeset
10141 rif->update_window_end_hook (w, 0, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10142 update_end (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10143 }
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 /* Shift current matrix down by nrows_scrolled lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10146 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10147 rotate_matrix (w->current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10148 start_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10149 MATRIX_ROW_VPOS (bottom_row, w->current_matrix),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10150 nrows_scrolled);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10151
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10152 /* Disable lines not reused. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10153 for (i = 0; i < it.vpos; ++i)
31849
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10154 (start_row + i)->enabled_p = 0;
25012
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 /* Re-compute Y positions. */
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10157 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10158 max_y = it.last_visible_y;
31849
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10159 for (row = start_row + nrows_scrolled;
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10160 row < bottom_row;
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10161 ++row)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10162 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10163 row->y = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10164
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10165 if (row->y < min_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10166 row->visible_height = row->height - (min_y - row->y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10167 else if (row->y + row->height > max_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10168 row->visible_height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10169 = row->height - (row->y + row->height - max_y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10170 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10171 row->visible_height = row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10172
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10173 it.current_y += row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10174
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10175 if (MATRIX_ROW_DISPLAYS_TEXT_P (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10176 last_reused_text_row = row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10177 if (MATRIX_ROW_BOTTOM_Y (row) >= it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10178 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10179 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10180 }
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 /* Update window_end_pos etc.; last_reused_text_row is the last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10183 reused row from the current matrix containing text, if any.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10184 The value of last_text_row is the last displayed line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10185 containing text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10186 if (last_reused_text_row)
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 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10189 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_reused_text_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10190 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10191 Z - MATRIX_ROW_END_CHARPOS (last_reused_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10192 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10193 MATRIX_ROW_VPOS (last_reused_text_row,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10194 w->current_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10195 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10196 else if (last_text_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10197 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10198 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10199 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10200 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10201 Z - MATRIX_ROW_END_CHARPOS (last_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10202 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10203 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10204 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10205 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10206 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10207 /* This window must be completely empty. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10208 w->window_end_bytepos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10209 XSETFASTINT (w->window_end_pos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10210 XSETFASTINT (w->window_end_vpos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10211 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10212 w->window_end_valid = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10213
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10214 /* Update hint: don't try scrolling again in update_window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10215 w->desired_matrix->no_scrolling_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10216
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10217 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10218 debug_method_add (w, "try_window_reusing_current_matrix 1");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10219 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10220 return 1;
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 else if (CHARPOS (new_start) > CHARPOS (start))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10223 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10224 struct glyph_row *pt_row, *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10225 struct glyph_row *first_reusable_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10226 struct glyph_row *first_row_to_display;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10227 int dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10228 int yb = window_text_bottom_y (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10229
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10230 IF_DEBUG (debug_method_add (w, "twu2"));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10231
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10232 /* 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
10233 reuse a partially visible line at the end. */
31849
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10234 first_reusable_row = start_row;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10235 while (first_reusable_row->enabled_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10236 && MATRIX_ROW_BOTTOM_Y (first_reusable_row) < yb
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10237 && (MATRIX_ROW_START_CHARPOS (first_reusable_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10238 < CHARPOS (new_start)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10239 ++first_reusable_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10240
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10241 /* Give up if there is no row to reuse. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10242 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
10243 || !first_reusable_row->enabled_p
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
10244 || (MATRIX_ROW_START_CHARPOS (first_reusable_row)
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
10245 != CHARPOS (new_start)))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10246 return 0;
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 /* We can reuse fully visible rows beginning with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10249 first_reusable_row to the end of the window. Set
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10250 first_row_to_display to the first row that cannot be reused.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10251 Set pt_row to the row containing point, if there is any. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10252 first_row_to_display = first_reusable_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10253 pt_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10254 while (MATRIX_ROW_BOTTOM_Y (first_row_to_display) < yb)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10255 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10256 if (PT >= MATRIX_ROW_START_CHARPOS (first_row_to_display)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10257 && PT < MATRIX_ROW_END_CHARPOS (first_row_to_display))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10258 pt_row = first_row_to_display;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10259
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10260 ++first_row_to_display;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10263 /* Start displaying at the start of first_row_to_display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10264 xassert (first_row_to_display->y < yb);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10265 init_to_row_start (&it, w, first_row_to_display);
31849
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10266 nrows_scrolled = (MATRIX_ROW_VPOS (first_reusable_row, w->current_matrix)
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10267 - start_vpos);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10268 it.vpos = (MATRIX_ROW_VPOS (first_row_to_display, w->current_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10269 - nrows_scrolled);
31849
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10270 it.current_y = (first_row_to_display->y - first_reusable_row->y
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10271 + WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10272
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10273 /* Display lines beginning with first_row_to_display in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10274 desired matrix. Set last_text_row to the last row displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10275 that displays text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10276 it.glyph_row = MATRIX_ROW (w->desired_matrix, it.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10277 if (pt_row == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10278 w->cursor.vpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10279 last_text_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10280 while (it.current_y < it.last_visible_y && !fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10281 if (display_line (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10282 last_text_row = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10283
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10284 /* Give up If point isn't in a row displayed or reused. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10285 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10286 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10287 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10288 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10289 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10290
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10291 /* 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
10292 position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10293 if (pt_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10294 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10295 w->cursor.vpos -= MATRIX_ROW_VPOS (first_reusable_row,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10296 w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10297 w->cursor.y -= first_reusable_row->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10298 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10299
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10300 /* Scroll the display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10301 run.current_y = first_reusable_row->y;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10302 run.desired_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10303 run.height = it.last_visible_y - run.current_y;
31826
2c8c52a67b91 (try_window_reusing_current_matrix): Fix computation of
Gerd Moellmann <gerd@gnu.org>
parents: 31650
diff changeset
10304 dy = run.current_y - run.desired_y;
2c8c52a67b91 (try_window_reusing_current_matrix): Fix computation of
Gerd Moellmann <gerd@gnu.org>
parents: 31650
diff changeset
10305
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10306 if (run.height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10307 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10308 struct frame *f = XFRAME (WINDOW_FRAME (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10309 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10310 rif->update_window_begin_hook (w);
30159
1b0331a7c724 (try_window_reusing_current_matrix, try_window_id):
Gerd Moellmann <gerd@gnu.org>
parents: 30136
diff changeset
10311 rif->clear_mouse_face (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10312 rif->scroll_run_hook (w, &run);
30159
1b0331a7c724 (try_window_reusing_current_matrix, try_window_id):
Gerd Moellmann <gerd@gnu.org>
parents: 30136
diff changeset
10313 rif->update_window_end_hook (w, 0, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10314 update_end (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10315 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10316
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10317 /* Adjust Y positions of reused rows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10318 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w);
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10319 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10320 max_y = it.last_visible_y;
31849
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10321 for (row = first_reusable_row; row < first_row_to_display; ++row)
25012
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 row->y -= dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10324 if (row->y < min_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10325 row->visible_height = row->height - (min_y - row->y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10326 else if (row->y + row->height > max_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10327 row->visible_height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10328 = row->height - (row->y + row->height - max_y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10329 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10330 row->visible_height = row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10331 }
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 /* Disable rows not reused. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10334 while (row < bottom_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10335 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10336 row->enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10337 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10338 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10339
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10340 /* Scroll the current matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10341 xassert (nrows_scrolled > 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10342 rotate_matrix (w->current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10343 start_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10344 MATRIX_ROW_VPOS (bottom_row, w->current_matrix),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10345 -nrows_scrolled);
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 /* Adjust window end. A null value of last_text_row means that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10348 the window end is in reused rows which in turn means that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10349 only its vpos can have changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10350 if (last_text_row)
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 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10353 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10354 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10355 Z - MATRIX_ROW_END_CHARPOS (last_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10356 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10357 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix));
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10360 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10361 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10362 XFASTINT (w->window_end_vpos) - nrows_scrolled);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10363 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10364
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10365 w->window_end_valid = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10366 w->desired_matrix->no_scrolling_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10367
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10368 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10369 debug_method_add (w, "try_window_reusing_current_matrix 2");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10370 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10371 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10372 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10373
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10374 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10375 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10376
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10377
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10378
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10379 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10380 Window redisplay reusing current matrix when buffer has changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10381 ************************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10382
32539
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10383 static struct glyph_row *find_last_unchanged_at_beg_row P_ ((struct window *));
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10384 static struct glyph_row *find_first_unchanged_at_end_row P_ ((struct window *,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10385 int *, int *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10386 static struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10387 find_last_row_displaying_text P_ ((struct glyph_matrix *, struct it *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10388 struct glyph_row *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10389
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 /* Return the last row in MATRIX displaying text. If row START is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10392 non-null, start searching with that row. IT gives the dimensions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10393 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
10394 a pointer to the row found. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10395
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10396 static struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10397 find_last_row_displaying_text (matrix, it, start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10398 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10399 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10400 struct glyph_row *start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10401 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10402 struct glyph_row *row, *row_found;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10403
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10404 /* 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
10405 displaying text. The loop looks funny but think of partially
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10406 visible lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10407 row_found = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10408 row = start ? start : MATRIX_FIRST_TEXT_ROW (matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10409 while (MATRIX_ROW_DISPLAYS_TEXT_P (row))
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 xassert (row->enabled_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10412 row_found = row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10413 if (MATRIX_ROW_BOTTOM_Y (row) >= it->last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10414 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10415 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10416 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10417
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10418 return row_found;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10419 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10420
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10421
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10422 /* 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
10423 by changes at the start of current_buffer that occurred since the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10424 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
10425
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10426 The global variable beg_unchanged has to contain the number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10427 bytes unchanged at the start of current_buffer. BEG +
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10428 beg_unchanged is the buffer position of the first changed byte in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10429 current_buffer. Characters at positions < BEG + beg_unchanged are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10430 at the same buffer positions as they were when the current matrix
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10431 was built. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10432
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10433 static struct glyph_row *
32539
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10434 find_last_unchanged_at_beg_row (w)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10435 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10436 {
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
10437 int first_changed_pos = BEG + BEG_UNCHANGED;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10438 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10439 struct glyph_row *row_found = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10440 int yb = window_text_bottom_y (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10441
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10442 /* Find the last row displaying unchanged text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10443 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10444 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10445 && MATRIX_ROW_START_CHARPOS (row) < first_changed_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10446 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10447 if (/* If row ends before first_changed_pos, it is unchanged,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10448 except in some case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10449 MATRIX_ROW_END_CHARPOS (row) <= first_changed_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10450 /* 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
10451 unchanged. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10452 && !row->ends_at_zv_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10453 /* When first_changed_pos is the end of a continued line,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10454 row is not unchanged because it may be no longer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10455 continued. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10456 && !(MATRIX_ROW_END_CHARPOS (row) == first_changed_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10457 && row->continued_p))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10458 row_found = row;
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 /* Stop if last visible row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10461 if (MATRIX_ROW_BOTTOM_Y (row) >= yb)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10462 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10463
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10464 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10465 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10466
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10467 return row_found;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10468 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10469
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 /* 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
10472 affected by changes at the end of current_buffer since the last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10473 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
10474 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
10475 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
10476 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
10477 exists, i.e. all rows are affected by changes. */
25012
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 static struct glyph_row *
32539
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10480 find_first_unchanged_at_end_row (w, delta, delta_bytes)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10481 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10482 int *delta, *delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10483 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10484 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10485 struct glyph_row *row_found = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10486
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10487 *delta = *delta_bytes = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10488
32539
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10489 /* Display must not have been paused, otherwise the current matrix
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10490 is not up to date. */
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10491 if (NILP (w->window_end_valid))
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10492 abort ();
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10493
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10494 /* A value of window_end_pos >= END_UNCHANGED means that the window
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10495 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
10496 unchanged row at the end of W's current matrix. */
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
10497 if (XFASTINT (w->window_end_pos) >= END_UNCHANGED)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10498 return NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10499
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10500 /* 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
10501 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
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 /* If matrix is entirely empty, no unchanged row exists. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10504 if (MATRIX_ROW_DISPLAYS_TEXT_P (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10505 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10506 /* 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
10507 meaningful buffer position in it. The end position of row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10508 corresponds to window_end_pos. This allows us to translate
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10509 buffer positions in the current matrix to current buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10510 positions for characters not in changed text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10511 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
10512 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
10513 int last_unchanged_pos, last_unchanged_pos_old;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10514 struct glyph_row *first_text_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10515 = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10516
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10517 *delta = Z - Z_old;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10518 *delta_bytes = Z_BYTE - Z_BYTE_old;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10519
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10520 /* Set last_unchanged_pos to the buffer position of the last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10521 character in the buffer that has not been changed. Z is the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10522 index + 1 of the last byte in current_buffer, i.e. by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10523 subtracting end_unchanged we get the index of the last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10524 unchanged character, and we have to add BEG to get its buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10525 position. */
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
10526 last_unchanged_pos = Z - END_UNCHANGED + BEG;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10527 last_unchanged_pos_old = last_unchanged_pos - *delta;
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 /* Search backward from ROW for a row displaying a line that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10530 starts at a minimum position >= last_unchanged_pos_old. */
32539
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10531 for (; row > first_text_row; --row)
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10532 {
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10533 if (!row->enabled_p || !MATRIX_ROW_DISPLAYS_TEXT_P (row))
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10534 abort ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10535
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10536 if (MATRIX_ROW_START_CHARPOS (row) >= last_unchanged_pos_old)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10537 row_found = row;
32539
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10538 }
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10539 }
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10540
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10541 if (row_found && !MATRIX_ROW_DISPLAYS_TEXT_P (row_found))
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10542 abort ();
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10543
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10544 return row_found;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10545 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10546
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10547
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10548 /* Make sure that glyph rows in the current matrix of window W
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10549 reference the same glyph memory as corresponding rows in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10550 frame's frame matrix. This function is called after scrolling W's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10551 current matrix on a terminal frame in try_window_id and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10552 try_window_reusing_current_matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10553
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10554 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10555 sync_frame_with_window_matrix_rows (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10556 struct window *w;
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 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10559 struct glyph_row *window_row, *window_row_end, *frame_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10560
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10561 /* Preconditions: W must be a leaf window and full-width. Its frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10562 must have a frame matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10563 xassert (NILP (w->hchild) && NILP (w->vchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10564 xassert (WINDOW_FULL_WIDTH_P (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10565 xassert (!FRAME_WINDOW_P (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10566
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10567 /* 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
10568 have, by definition, to be the same as glyph pointers in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10569 corresponding frame matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10570 window_row = w->current_matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10571 window_row_end = window_row + w->current_matrix->nrows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10572 frame_row = f->current_matrix->rows + XFASTINT (w->top);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10573 while (window_row < window_row_end)
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 int area;
25778
9a6099957160 (sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents: 25777
diff changeset
10576
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10577 for (area = LEFT_MARGIN_AREA; area <= LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10578 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
10579
9a6099957160 (sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents: 25777
diff changeset
10580 /* 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
10581 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
10582 if (!window_row->enabled_p)
9a6099957160 (sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents: 25777
diff changeset
10583 frame_row->enabled_p = 0;
9a6099957160 (sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents: 25777
diff changeset
10584
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10585 ++window_row, ++frame_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10586 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10589
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10590 /* 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
10591 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
10592 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
10593 containing CHARPOS or null. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10594
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10595 static struct glyph_row *
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10596 row_containing_pos (w, charpos, start, end)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10597 struct window *w;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10598 int charpos;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10599 struct glyph_row *start, *end;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10600 {
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10601 struct glyph_row *row = start;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10602 int last_y;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10603
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10604 /* 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
10605 if (row->mode_line_p)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10606 ++row;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10607
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10608 if ((end && row >= end) || !row->enabled_p)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10609 return NULL;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10610
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10611 last_y = window_text_bottom_y (w);
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10612
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10613 while ((end == NULL || row < end)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10614 && (MATRIX_ROW_END_CHARPOS (row) < charpos
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10615 /* The end position of a row equals the start
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10616 position of the next row. If CHARPOS is there, we
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10617 would rather display it in the next line, except
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10618 when this line ends in ZV. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10619 || (MATRIX_ROW_END_CHARPOS (row) == charpos
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10620 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10621 || !row->ends_at_zv_p)))
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10622 && MATRIX_ROW_BOTTOM_Y (row) < last_y)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10623 ++row;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10624
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10625 /* Give up if CHARPOS not found. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10626 if ((end && row >= end)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10627 || charpos < MATRIX_ROW_START_CHARPOS (row)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10628 || charpos > MATRIX_ROW_END_CHARPOS (row))
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10629 row = NULL;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10630
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10631 return row;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10632 }
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10633
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10634
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10635 /* Try to redisplay window W by reusing its existing display. W's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10636 current matrix must be up to date when this function is called,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10637 i.e. window_end_valid must not be nil.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10638
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10639 Value is
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 1 if display has been updated
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10642 0 if otherwise unsuccessful
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10643 -1 if redisplay with same window start is known not to succeed
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 The following steps are performed:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10646
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10647 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
10648 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
10649 is found, give up.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10650
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10651 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
10652 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
10653
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10654 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
10655 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
10656 the window.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10657
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10658 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
10659
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10660 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
10661 display and current matrix as needed.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10662
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10663 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
10664 happen under various circumstances, like a partially visible line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10665 becoming fully visible, or because newly displayed lines are displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10666 in smaller font sizes.
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 7. Update W's window end information. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10669
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10670 /* Check that window end is what we expect it to be. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10671
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10672 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10673 try_window_id (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10674 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10675 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10676 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10677 struct glyph_matrix *current_matrix = w->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10678 struct glyph_matrix *desired_matrix = w->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10679 struct glyph_row *last_unchanged_at_beg_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10680 struct glyph_row *first_unchanged_at_end_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10681 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10682 struct glyph_row *bottom_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10683 int bottom_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10684 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10685 int delta = 0, delta_bytes = 0, stop_pos, dvpos, dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10686 struct text_pos start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10687 struct run run;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10688 int first_unchanged_at_end_vpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10689 struct glyph_row *last_text_row, *last_text_row_at_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10690 struct text_pos start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10691
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10692 SET_TEXT_POS_FROM_MARKER (start, w->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10693
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10694 /* Check pre-conditions. Window end must be valid, otherwise
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10695 the current matrix would not be up to date. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10696 xassert (!NILP (w->window_end_valid));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10697 xassert (FRAME_WINDOW_P (XFRAME (w->frame))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10698 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10699
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10700 /* 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
10701 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
10702 initially at Z for freshly visited files. The code below would
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10703 set end_unchanged to 0 in that case. */
27990
723662ab7db4 (try_window_id): Recompute unchanged information if
Gerd Moellmann <gerd@gnu.org>
parents: 27897
diff changeset
10704 if (MODIFF > SAVE_MODIFF
723662ab7db4 (try_window_id): Recompute unchanged information if
Gerd Moellmann <gerd@gnu.org>
parents: 27897
diff changeset
10705 /* This seems to happen sometimes after saving a buffer. */
723662ab7db4 (try_window_id): Recompute unchanged information if
Gerd Moellmann <gerd@gnu.org>
parents: 27897
diff changeset
10706 || BEG_UNCHANGED + END_UNCHANGED > Z_BYTE)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10707 {
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
10708 if (GPT - BEG < BEG_UNCHANGED)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
10709 BEG_UNCHANGED = GPT - BEG;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
10710 if (Z - GPT < END_UNCHANGED)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
10711 END_UNCHANGED = Z - GPT;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10712 }
27540
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
10713
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10714 /* 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
10715 front of that newline, then changes don't affect the display.
28709
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10716 This case happens with stealth-fontification. Note that although
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10717 the display is unchanged, glyph positions in the matrix have to
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10718 be adjusted, of course. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10719 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10720 if (CHARPOS (start) > BEGV
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
10721 && Z - END_UNCHANGED < CHARPOS (start) - 1
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10722 && FETCH_BYTE (BYTEPOS (start) - 1) == '\n'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10723 && PT < MATRIX_ROW_END_CHARPOS (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10724 {
28709
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10725 struct glyph_row *r0 = MATRIX_FIRST_TEXT_ROW (current_matrix);
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10726 int delta = CHARPOS (start) - MATRIX_ROW_START_CHARPOS (r0);
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10727
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10728 if (delta)
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10729 {
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10730 struct glyph_row *r1 = MATRIX_BOTTOM_TEXT_ROW (current_matrix, w);
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10731 int delta_bytes = BYTEPOS (start) - MATRIX_ROW_START_BYTEPOS (r0);
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10732
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10733 increment_matrix_positions (w->current_matrix,
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10734 MATRIX_ROW_VPOS (r0, current_matrix),
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10735 MATRIX_ROW_VPOS (r1, current_matrix),
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10736 delta, delta_bytes);
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10737 }
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10738
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10739 #if 0 /* If changes are all in front of the window start, the
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10740 distance of the last displayed glyph from Z hasn't
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10741 changed. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10742 w->window_end_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10743 = make_number (Z - MATRIX_ROW_END_CHARPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10744 w->window_end_bytepos
28464
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
10745 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
28709
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10746 #endif
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10747
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10748 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10749 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10750
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10751 /* Return quickly if changes are all below what is displayed in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10752 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
10753 if (BEG_UNCHANGED > MATRIX_ROW_END_CHARPOS (row)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10754 && PT < MATRIX_ROW_END_CHARPOS (row))
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 /* We have to update window end positions because the buffer's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10757 size has changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10758 w->window_end_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10759 = make_number (Z - MATRIX_ROW_END_CHARPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10760 w->window_end_bytepos
28464
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
10761 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
30136
8dc78ef485a4 (try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents: 29981
diff changeset
10762
8dc78ef485a4 (try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents: 29981
diff changeset
10763 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
8dc78ef485a4 (try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents: 29981
diff changeset
10764 row = row_containing_pos (w, PT, row, NULL);
8dc78ef485a4 (try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents: 29981
diff changeset
10765 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
8dc78ef485a4 (try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents: 29981
diff changeset
10766 return 2;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10767 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10768
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10769 /* Check that window start agrees with the start of the first glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10770 row in its current matrix. Check this after we know the window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10771 start is not in changed text, otherwise positions would not be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10772 comparable. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10773 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10774 if (!TEXT_POS_EQUAL_P (start, row->start.pos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10775 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10776
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10777 /* Compute the position at which we have to start displaying new
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10778 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
10779 reusable because they are not displaying changed text. Find the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10780 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
10781 start of current_buffer. Value is null if changes start in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10782 first line of window. */
32539
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10783 last_unchanged_at_beg_row = find_last_unchanged_at_beg_row (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10784 if (last_unchanged_at_beg_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10785 {
33898
93b22ccc23e2 (try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents: 33863
diff changeset
10786 /* Avoid starting to display in the moddle of a character, a TAB
93b22ccc23e2 (try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents: 33863
diff changeset
10787 for instance. This is easier than to set up the iterator
93b22ccc23e2 (try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents: 33863
diff changeset
10788 exactly, and it's not a frequent case, so the additional
93b22ccc23e2 (try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents: 33863
diff changeset
10789 effort wouldn't really pay off. */
93b22ccc23e2 (try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents: 33863
diff changeset
10790 while (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (last_unchanged_at_beg_row)
93b22ccc23e2 (try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents: 33863
diff changeset
10791 && last_unchanged_at_beg_row > w->current_matrix->rows)
93b22ccc23e2 (try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents: 33863
diff changeset
10792 --last_unchanged_at_beg_row;
93b22ccc23e2 (try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents: 33863
diff changeset
10793
93b22ccc23e2 (try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents: 33863
diff changeset
10794 if (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (last_unchanged_at_beg_row))
93b22ccc23e2 (try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents: 33863
diff changeset
10795 return 0;
93b22ccc23e2 (try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents: 33863
diff changeset
10796
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10797 init_to_row_end (&it, w, last_unchanged_at_beg_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10798 start_pos = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10799
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10800 /* Start displaying new lines in the desired matrix at the same
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10801 vpos we would use in the current matrix, i.e. below
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10802 last_unchanged_at_beg_row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10803 it.vpos = 1 + MATRIX_ROW_VPOS (last_unchanged_at_beg_row,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10804 current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10805 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10806 it.current_y = MATRIX_ROW_BOTTOM_Y (last_unchanged_at_beg_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10807
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10808 xassert (it.hpos == 0 && it.current_x == 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10809 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10810 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10811 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10812 /* There are no reusable lines at the start of the window.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10813 Start displaying in the first line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10814 start_display (&it, w, start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10815 start_pos = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10816 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10817
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10818 /* 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
10819 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
10820 which case we must redisplay to the end of the window. delta
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10821 will be set to the value by which buffer positions beginning with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10822 first_unchanged_at_end_row have to be adjusted due to text
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10823 changes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10824 first_unchanged_at_end_row
32539
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10825 = find_first_unchanged_at_end_row (w, &delta, &delta_bytes);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10826 IF_DEBUG (debug_delta = delta);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10827 IF_DEBUG (debug_delta_bytes = delta_bytes);
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 /* 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
10830 display new lines. If first_unchanged_at_end_row != NULL, this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10831 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
10832 row. For first_unchanged_at_end_row == NULL, use 0 to indicate
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10833 that we don't stop at a buffer position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10834 stop_pos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10835 if (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10836 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10837 xassert (last_unchanged_at_beg_row == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10838 || first_unchanged_at_end_row >= last_unchanged_at_beg_row);
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 /* If this is a continuation line, move forward to the next one
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10841 that isn't. Changes in lines above affect this line.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10842 Caution: this may move first_unchanged_at_end_row to a row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10843 not displaying text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10844 while (MATRIX_ROW_CONTINUATION_LINE_P (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10845 && MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10846 && (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10847 < it.last_visible_y))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10848 ++first_unchanged_at_end_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10849
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10850 if (!MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10851 || (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10852 >= it.last_visible_y))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10853 first_unchanged_at_end_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10854 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10855 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10856 stop_pos = (MATRIX_ROW_START_CHARPOS (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10857 + delta);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10858 first_unchanged_at_end_vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10859 = 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
10860 xassert (stop_pos >= Z - END_UNCHANGED);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10861 }
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 else if (last_unchanged_at_beg_row == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10864 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10865
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10866
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10867 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10868
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10869 /* 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
10870 now displays text. This is a necessary condition for the window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10871 end pos calculation at the end of this function. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10872 xassert (first_unchanged_at_end_row == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10873 || MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10874
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10875 debug_last_unchanged_at_beg_vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10876 = (last_unchanged_at_beg_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10877 ? MATRIX_ROW_VPOS (last_unchanged_at_beg_row, current_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10878 : -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10879 debug_first_unchanged_at_end_vpos = first_unchanged_at_end_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10880
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10881 #endif /* GLYPH_DEBUG != 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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10884 /* Display new lines. Set last_text_row to the last new line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10885 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
10886 line where the window_end_vpos is. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10887 w->cursor.vpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10888 last_text_row = NULL;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10889 overlay_arrow_seen = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10890 while (it.current_y < it.last_visible_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10891 && !fonts_changed_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10892 && (first_unchanged_at_end_row == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10893 || IT_CHARPOS (it) < stop_pos))
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 if (display_line (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10896 last_text_row = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10897 }
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 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10900 return -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10901
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10902
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10903 /* Compute differences in buffer positions, y-positions etc. for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10904 lines reused at the bottom of the window. Compute what we can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10905 scroll. */
25493
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10906 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
10907 /* 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
10908 bottom of the window. */
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10909 && it.current_y < it.last_visible_y)
25012
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 dvpos = (it.vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10912 - MATRIX_ROW_VPOS (first_unchanged_at_end_row,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10913 current_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10914 dy = it.current_y - first_unchanged_at_end_row->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10915 run.current_y = first_unchanged_at_end_row->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10916 run.desired_y = run.current_y + dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10917 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
10918 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10919 else
25493
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10920 {
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
10921 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
10922 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
10923 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10924 IF_DEBUG (debug_dvpos = dvpos; debug_dy = dy);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10925
25394
ed9fe1a2c8ae (try_window_id): Remove typo.
Gerd Moellmann <gerd@gnu.org>
parents: 25393
diff changeset
10926
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10927 /* Find the cursor if not already found. We have to decide whether
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10928 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
10929 not a very frequent case.) This decision has to be made before
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10930 the current matrix is altered. A value of cursor.vpos < 0 means
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10931 that PT is either in one of the lines beginning at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10932 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
10933 lines that might be displayed later at the window end; as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10934 mentioned, this is not a frequent case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10935 if (w->cursor.vpos < 0)
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 /* Cursor in unchanged rows at the top? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10938 if (PT < CHARPOS (start_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10939 && last_unchanged_at_beg_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10940 {
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10941 row = row_containing_pos (w, PT,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10942 MATRIX_FIRST_TEXT_ROW (w->current_matrix),
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10943 last_unchanged_at_beg_row + 1);
31493
900897103eb2 (try_window_id): When trying to locate cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 31338
diff changeset
10944 if (row)
900897103eb2 (try_window_id): When trying to locate cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 31338
diff changeset
10945 set_cursor_from_row (w, row, w->current_matrix, 0, 0, 0, 0);
25012
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 /* Start from first_unchanged_at_end_row looking for PT. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10949 else if (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10950 {
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10951 row = row_containing_pos (w, PT - delta,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10952 first_unchanged_at_end_row, NULL);
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10953 if (row)
25393
9aff86718a20 (try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents: 25388
diff changeset
10954 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
10955 delta_bytes, dy, dvpos);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10956 }
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 /* Give up if cursor was not found. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10959 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10960 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10961 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10962 return -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10963 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10964 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10965
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10966 /* Don't let the cursor end in the scroll margins. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10967 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10968 int this_scroll_margin, cursor_height;
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 this_scroll_margin = max (0, scroll_margin);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10971 this_scroll_margin = min (this_scroll_margin,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10972 XFASTINT (w->height) / 4);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10973 this_scroll_margin *= CANON_Y_UNIT (it.f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10974 cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10975
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10976 if ((w->cursor.y < this_scroll_margin
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10977 && CHARPOS (start) > BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10978 /* Don't take scroll margin into account at the bottom because
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10979 old redisplay didn't do it either. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10980 || w->cursor.y + cursor_height > it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10981 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10982 w->cursor.vpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10983 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10984 return -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10985 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10986 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10987
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10988 /* Scroll the display. Do it before changing the current matrix so
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10989 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
10990 found. */
28539
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
10991 if (dy && run.height)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10992 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10993 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10994
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10995 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10996 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10997 rif->update_window_begin_hook (w);
30159
1b0331a7c724 (try_window_reusing_current_matrix, try_window_id):
Gerd Moellmann <gerd@gnu.org>
parents: 30136
diff changeset
10998 rif->clear_mouse_face (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10999 rif->scroll_run_hook (w, &run);
30159
1b0331a7c724 (try_window_reusing_current_matrix, try_window_id):
Gerd Moellmann <gerd@gnu.org>
parents: 30136
diff changeset
11000 rif->update_window_end_hook (w, 0, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11001 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11002 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11003 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11004 /* Terminal frame. In this case, dvpos gives the number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11005 lines to scroll by; dvpos < 0 means scroll up. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11006 int first_unchanged_at_end_vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11007 = MATRIX_ROW_VPOS (first_unchanged_at_end_row, w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11008 int from = XFASTINT (w->top) + first_unchanged_at_end_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11009 int end = XFASTINT (w->top) + window_internal_height (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11010
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11011 /* Perform the operation on the screen. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11012 if (dvpos > 0)
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
11013 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11014 /* Scroll last_unchanged_at_beg_row to the end of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11015 window down dvpos lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11016 set_terminal_window (end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11017
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11018 /* On dumb terminals delete dvpos lines at the end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11019 before inserting dvpos empty lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11020 if (!scroll_region_ok)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11021 ins_del_lines (end - dvpos, -dvpos);
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 /* Insert dvpos empty lines in front of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11024 last_unchanged_at_beg_row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11025 ins_del_lines (from, dvpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11026 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11027 else if (dvpos < 0)
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 /* Scroll up last_unchanged_at_beg_vpos to the end of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11030 the window to last_unchanged_at_beg_vpos - |dvpos|. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11031 set_terminal_window (end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11032
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11033 /* Delete dvpos lines in front of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11034 last_unchanged_at_beg_vpos. ins_del_lines will set
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11035 the cursor to the given vpos and emit |dvpos| delete
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11036 line sequences. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11037 ins_del_lines (from + dvpos, dvpos);
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 /* On a dumb terminal insert dvpos empty lines at the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11040 end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11041 if (!scroll_region_ok)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11042 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
11043 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11044
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11045 set_terminal_window (0);
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 update_end (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11049 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11050
25493
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
11051 /* 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
11052 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
11053 text. */
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
11054 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
11055 bottom_vpos = MATRIX_ROW_VPOS (bottom_row, current_matrix);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11056 if (dvpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11057 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11058 rotate_matrix (current_matrix, first_unchanged_at_end_vpos + dvpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11059 bottom_vpos, dvpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11060 enable_glyph_matrix_rows (current_matrix, bottom_vpos + dvpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11061 bottom_vpos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11062 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11063 else if (dvpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11064 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11065 rotate_matrix (current_matrix, first_unchanged_at_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11066 bottom_vpos, dvpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11067 enable_glyph_matrix_rows (current_matrix, first_unchanged_at_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11068 first_unchanged_at_end_vpos + dvpos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11069 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11070
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11071 /* For frame-based redisplay, make sure that current frame and window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11072 matrix are in sync with respect to glyph memory. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11073 if (!FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11074 sync_frame_with_window_matrix_rows (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11075
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11076 /* Adjust buffer positions in reused rows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11077 if (delta)
28709
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
11078 increment_matrix_positions (current_matrix,
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
11079 first_unchanged_at_end_vpos + dvpos,
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
11080 bottom_vpos, delta, delta_bytes);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11081
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11082 /* Adjust Y positions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11083 if (dy)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11084 shift_glyph_matrix (w, current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11085 first_unchanged_at_end_vpos + dvpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11086 bottom_vpos, dy);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11087
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11088 if (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11089 first_unchanged_at_end_row += dvpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11090
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11091 /* 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
11092 the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11093 last_text_row_at_end = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11094 if (dy < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11095 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11096 /* 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
11097 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
11098 the matrix by dvpos. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11099 int last_vpos = XFASTINT (w->window_end_vpos) + dvpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11100 struct glyph_row *last_row = MATRIX_ROW (current_matrix, last_vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11101
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11102 /* If last_row is the window end line, it should display text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11103 xassert (last_row->displays_text_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11104
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11105 /* If window end line was partially visible before, begin
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11106 displaying at that line. Otherwise begin displaying with the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11107 line following it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11108 if (MATRIX_ROW_BOTTOM_Y (last_row) - dy >= it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11109 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11110 init_to_row_start (&it, w, last_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11111 it.vpos = last_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11112 it.current_y = last_row->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11113 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11114 else
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 init_to_row_end (&it, w, last_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11117 it.vpos = 1 + last_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11118 it.current_y = MATRIX_ROW_BOTTOM_Y (last_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11119 ++last_row;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11122 /* 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
11123 the right continuation_lines_width and current_x. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11124 it.continuation_lines_width = last_row->continuation_lines_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11125 it.hpos = it.current_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11126
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11127 /* Display the rest of the lines at the window end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11128 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11129 while (it.current_y < it.last_visible_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11130 && !fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11131 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11132 /* Is it always sure that the display agrees with lines in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11133 the current matrix? I don't think so, so we mark rows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11134 displayed invalid in the current matrix by setting their
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11135 enabled_p flag to zero. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11136 MATRIX_ROW (w->current_matrix, it.vpos)->enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11137 if (display_line (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11138 last_text_row_at_end = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11139 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11140 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11141
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11142 /* Update window_end_pos and window_end_vpos. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11143 if (first_unchanged_at_end_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11144 && first_unchanged_at_end_row->y < it.last_visible_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11145 && !last_text_row_at_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11146 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11147 /* Window end line if one of the preserved rows from the current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11148 matrix. Set row to the last row displaying text in current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11149 matrix starting at first_unchanged_at_end_row, after
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11150 scrolling. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11151 xassert (first_unchanged_at_end_row->displays_text_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11152 row = find_last_row_displaying_text (w->current_matrix, &it,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11153 first_unchanged_at_end_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11154 xassert (row && MATRIX_ROW_DISPLAYS_TEXT_P (row));
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 XSETFASTINT (w->window_end_pos, Z - MATRIX_ROW_END_CHARPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11157 w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11158 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11159 MATRIX_ROW_VPOS (row, w->current_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11160 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11161 else if (last_text_row_at_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11162 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11163 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11164 Z - MATRIX_ROW_END_CHARPOS (last_text_row_at_end));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11165 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11166 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row_at_end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11167 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11168 MATRIX_ROW_VPOS (last_text_row_at_end, desired_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11169 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11170 else if (last_text_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11171 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11172 /* 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
11173 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
11174 in the desired matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11175 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11176 Z - MATRIX_ROW_END_CHARPOS (last_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11177 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11178 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11179 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11180 MATRIX_ROW_VPOS (last_text_row, desired_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11181 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11182 else if (first_unchanged_at_end_row == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11183 && last_text_row == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11184 && last_text_row_at_end == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11185 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11186 /* Displayed to end of window, but no line containing text was
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11187 displayed. Lines were deleted at the end of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11188 int vpos;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11189 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
11190
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11191 for (vpos = XFASTINT (w->window_end_vpos); vpos > 0; --vpos)
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11192 if ((w->desired_matrix->rows[vpos + header_line_p].enabled_p
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11193 && w->desired_matrix->rows[vpos + header_line_p].displays_text_p)
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11194 || (!w->desired_matrix->rows[vpos + header_line_p].enabled_p
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11195 && w->current_matrix->rows[vpos + header_line_p].displays_text_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11196 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11197
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11198 w->window_end_vpos = make_number (vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11199 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11200 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11201 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11202
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11203 IF_DEBUG (debug_end_pos = XFASTINT (w->window_end_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11204 debug_end_vpos = XFASTINT (w->window_end_vpos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11205
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11206 /* Record that display has not been completed. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11207 w->window_end_valid = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11208 w->desired_matrix->no_scrolling_p = 1;
30136
8dc78ef485a4 (try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents: 29981
diff changeset
11209 return 3;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11210 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11211
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11212
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 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11215 More debugging support
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11216 ***********************************************************************/
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 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11219
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11220 void dump_glyph_row P_ ((struct glyph_matrix *, int, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11221 static void dump_glyph_matrix P_ ((struct glyph_matrix *, int));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11222
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11223
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11224 /* Dump the contents of glyph matrix MATRIX on stderr. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11225 WITH_GLYPHS_P is non-zero, dump glyph contents as well. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11226
29748
1cd9b7a33ad1 (dump_glyph_matrix): Add `static' to declaration (for pcc).
Dave Love <fx@gnu.org>
parents: 29698
diff changeset
11227 static void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11228 dump_glyph_matrix (matrix, with_glyphs_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11229 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11230 int with_glyphs_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11231 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11232 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11233 for (i = 0; i < matrix->nrows; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11234 dump_glyph_row (matrix, i, with_glyphs_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11235 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11236
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11237
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11238 /* Dump the contents of glyph row at VPOS in MATRIX to stderr.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11239 WITH_GLYPH_SP non-zero means dump glyph contents, too. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11240
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11241 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11242 dump_glyph_row (matrix, vpos, with_glyphs_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11243 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11244 int vpos, with_glyphs_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11245 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11246 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11247
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11248 if (vpos < 0 || vpos >= matrix->nrows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11249 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11250
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11251 row = MATRIX_ROW (matrix, vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11252
30652
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
11253 fprintf (stderr, "Row Start End Used oEI><O\\CTZFes X Y W H V A P\n");
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
11254 fprintf (stderr, "=======================================================================\n");
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
11255
31506
a1d733428491 (dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents: 31493
diff changeset
11256 fprintf (stderr, "%3d %5d %5d %4d %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d\
a1d733428491 (dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents: 31493
diff changeset
11257 %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d %4d %4d %4d %4d %4d %4d %4d\n",
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11258 row - matrix->rows,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11259 MATRIX_ROW_START_CHARPOS (row),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11260 MATRIX_ROW_END_CHARPOS (row),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11261 row->used[TEXT_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11262 row->contains_overlapping_glyphs_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11263 row->enabled_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11264 row->inverse_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11265 row->truncated_on_left_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11266 row->truncated_on_right_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11267 row->overlay_arrow_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11268 row->continued_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11269 MATRIX_ROW_CONTINUATION_LINE_P (row),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11270 row->displays_text_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11271 row->ends_at_zv_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11272 row->fill_line_p,
29473
80835e075d87 (display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents: 29461
diff changeset
11273 row->ends_in_middle_of_char_p,
80835e075d87 (display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents: 29461
diff changeset
11274 row->starts_in_middle_of_char_p,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11275 row->x,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11276 row->y,
30652
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
11277 row->pixel_width,
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
11278 row->height,
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
11279 row->visible_height,
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
11280 row->ascent,
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
11281 row->phys_ascent);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11282 fprintf (stderr, "%9d %5d\n", row->start.overlay_string_index,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11283 row->end.overlay_string_index);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11284 fprintf (stderr, "%9d %5d\n",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11285 CHARPOS (row->start.string_pos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11286 CHARPOS (row->end.string_pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11287 fprintf (stderr, "%9d %5d\n", row->start.dpvec_index,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11288 row->end.dpvec_index);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11289
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11290 if (with_glyphs_p)
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 struct glyph *glyph, *glyph_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11293 int prev_had_glyphs_p;
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 glyph = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11296 glyph_end = glyph + row->used[TEXT_AREA];
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 /* Glyph for a line end in text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11299 if (glyph == glyph_end && glyph->charpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11300 ++glyph_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11301
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11302 if (glyph < glyph_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11303 {
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11304 fprintf (stderr, " Glyph Type Pos O W Code C Face LR\n");
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11305 prev_had_glyphs_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11306 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11307 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11308 prev_had_glyphs_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11309
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11310 while (glyph < glyph_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11311 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11312 if (glyph->type == CHAR_GLYPH)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11313 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11314 fprintf (stderr,
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11315 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n",
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11316 glyph - row->glyphs[TEXT_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11317 'C',
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11318 glyph->charpos,
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11319 (BUFFERP (glyph->object)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11320 ? 'B'
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11321 : (STRINGP (glyph->object)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11322 ? 'S'
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11323 : '-')),
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11324 glyph->pixel_width,
27000
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
11325 glyph->u.ch,
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
11326 (glyph->u.ch < 0x80 && glyph->u.ch >= ' '
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
11327 ? glyph->u.ch
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11328 : '.'),
27000
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
11329 glyph->face_id,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11330 glyph->left_box_line_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11331 glyph->right_box_line_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11332 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11333 else if (glyph->type == STRETCH_GLYPH)
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 fprintf (stderr,
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11336 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n",
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11337 glyph - row->glyphs[TEXT_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11338 'S',
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11339 glyph->charpos,
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11340 (BUFFERP (glyph->object)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11341 ? 'B'
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11342 : (STRINGP (glyph->object)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11343 ? 'S'
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11344 : '-')),
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11345 glyph->pixel_width,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11346 0,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11347 '.',
27015
526f3b2398ce (dump_glyph_row): Adapt to changes in struct glyph.
Gerd Moellmann <gerd@gnu.org>
parents: 27011
diff changeset
11348 glyph->face_id,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11349 glyph->left_box_line_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11350 glyph->right_box_line_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11351 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11352 else if (glyph->type == IMAGE_GLYPH)
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 fprintf (stderr,
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11355 " %5d %4c %6d %c %3d 0x%05x %c %4d %1.1d%1.1d\n",
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11356 glyph - row->glyphs[TEXT_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11357 'I',
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11358 glyph->charpos,
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11359 (BUFFERP (glyph->object)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11360 ? 'B'
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11361 : (STRINGP (glyph->object)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11362 ? 'S'
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11363 : '-')),
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11364 glyph->pixel_width,
27000
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
11365 glyph->u.img_id,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11366 '.',
27015
526f3b2398ce (dump_glyph_row): Adapt to changes in struct glyph.
Gerd Moellmann <gerd@gnu.org>
parents: 27011
diff changeset
11367 glyph->face_id,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11368 glyph->left_box_line_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11369 glyph->right_box_line_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11370 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11371 ++glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11372 }
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11375
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11376
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11377 DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11378 Sdump_glyph_matrix, 0, 1, "p",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11379 "Dump the current matrix of the selected window to stderr.\n\
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11380 Shows contents of glyph row structures. With non-nil optional\n\
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11381 parameter WITH-GLYPHS-P, dump glyphs as well.")
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11382 (with_glyphs_p)
29185
239420a3c60d (Fdump_glyph_matrix): Declare the arg.
Dave Love <fx@gnu.org>
parents: 29023
diff changeset
11383 Lisp_Object with_glyphs_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11384 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11385 struct window *w = XWINDOW (selected_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11386 struct buffer *buffer = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11387
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11388 fprintf (stderr, "PT = %d, BEGV = %d. ZV = %d\n",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11389 BUF_PT (buffer), BUF_BEGV (buffer), BUF_ZV (buffer));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11390 fprintf (stderr, "Cursor x = %d, y = %d, hpos = %d, vpos = %d\n",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11391 w->cursor.x, w->cursor.y, w->cursor.hpos, w->cursor.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11392 fprintf (stderr, "=============================================\n");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11393 dump_glyph_matrix (w->current_matrix, !NILP (with_glyphs_p));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11394 return Qnil;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11397
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11398 DEFUN ("dump-glyph-row", Fdump_glyph_row, Sdump_glyph_row, 1, 1, "",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11399 "Dump glyph row ROW to stderr.")
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11400 (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11401 Lisp_Object row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11402 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11403 CHECK_NUMBER (row, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11404 dump_glyph_row (XWINDOW (selected_window)->current_matrix, XINT (row), 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11405 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11406 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11407
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11408
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
11409 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
11410 0, 0, "", "")
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11411 ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11412 {
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
11413 struct frame *sf = SELECTED_FRAME ();
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
11414 struct glyph_matrix *m = (XWINDOW (sf->tool_bar_window)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11415 ->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11416 dump_glyph_row (m, 0, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11417 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11418 }
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 DEFUN ("trace-redisplay-toggle", Ftrace_redisplay_toggle,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11422 Strace_redisplay_toggle, 0, 0, "",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11423 "Toggle tracing of redisplay.")
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11424 ()
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 trace_redisplay_p = !trace_redisplay_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11427 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11428 }
27540
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11429
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11430
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11431 DEFUN ("trace-to-stderr", Ftrace_to_stderr, Strace_to_stderr, 1, 1, "",
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11432 "Print STRING to stderr.")
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11433 (string)
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11434 Lisp_Object string;
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11435 {
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11436 CHECK_STRING (string, 0);
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11437 fprintf (stderr, "%s", XSTRING (string)->data);
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11438 return Qnil;
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11439 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11440
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11441 #endif /* GLYPH_DEBUG */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11442
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11443
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11444
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11445 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11446 Building Desired Matrix Rows
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11449 /* Return a temporary glyph row holding the glyphs of an overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11450 arrow. Only used for non-window-redisplay windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11451
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11452 static struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11453 get_overlay_arrow_glyph_row (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11454 struct window *w;
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 struct frame *f = XFRAME (WINDOW_FRAME (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11457 struct buffer *buffer = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11458 struct buffer *old = current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11459 unsigned char *arrow_string = XSTRING (Voverlay_arrow_string)->data;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11460 int arrow_len = XSTRING (Voverlay_arrow_string)->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11461 unsigned char *arrow_end = arrow_string + arrow_len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11462 unsigned char *p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11463 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11464 int multibyte_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11465 int n_glyphs_before;
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 set_buffer_temp (buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11468 init_iterator (&it, w, -1, -1, &scratch_glyph_row, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11469 it.glyph_row->used[TEXT_AREA] = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11470 SET_TEXT_POS (it.position, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11471
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11472 multibyte_p = !NILP (buffer->enable_multibyte_characters);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11473 p = arrow_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11474 while (p < arrow_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11475 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11476 Lisp_Object face, ilisp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11477
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11478 /* Get the next character. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11479 if (multibyte_p)
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
11480 it.c = string_char_and_length (p, arrow_len, &it.len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11481 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11482 it.c = *p, it.len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11483 p += it.len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11484
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11485 /* Get its face. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11486 XSETFASTINT (ilisp, p - arrow_string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11487 face = Fget_text_property (ilisp, Qface, Voverlay_arrow_string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11488 it.face_id = compute_char_face (f, it.c, face);
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 /* Compute its width, get its glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11491 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
11492 SET_TEXT_POS (it.position, -1, -1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11493 PRODUCE_GLYPHS (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11494
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11495 /* 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
11496 to remove some glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11497 if (it.current_x > it.last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11498 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11499 it.glyph_row->used[TEXT_AREA] = n_glyphs_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11500 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11501 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11502 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11503
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11504 set_buffer_temp (old);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11505 return it.glyph_row;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11508
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11509 /* Insert truncation glyphs at the start of IT->glyph_row. Truncation
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11510 glyphs are only inserted for terminal frames since we can't really
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11511 win with truncation glyphs when partially visible glyphs are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11512 involved. Which glyphs to insert is determined by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11513 produce_special_glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11514
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11515 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11516 insert_left_trunc_glyphs (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11517 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11518 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11519 struct it truncate_it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11520 struct glyph *from, *end, *to, *toend;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11521
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11522 xassert (!FRAME_WINDOW_P (it->f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11523
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11524 /* Get the truncation glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11525 truncate_it = *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11526 truncate_it.current_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11527 truncate_it.face_id = DEFAULT_FACE_ID;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11528 truncate_it.glyph_row = &scratch_glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11529 truncate_it.glyph_row->used[TEXT_AREA] = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11530 CHARPOS (truncate_it.position) = BYTEPOS (truncate_it.position) = -1;
28464
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
11531 truncate_it.object = make_number (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11532 produce_special_glyphs (&truncate_it, IT_TRUNCATION);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11533
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11534 /* Overwrite glyphs from IT with truncation glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11535 from = truncate_it.glyph_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11536 end = from + truncate_it.glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11537 to = it->glyph_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11538 toend = to + it->glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11539
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11540 while (from < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11541 *to++ = *from++;
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 /* There may be padding glyphs left over. Remove them. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11544 from = to;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11545 while (from < toend && CHAR_GLYPH_PADDING_P (*from))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11546 ++from;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11547 while (from < toend)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11548 *to++ = *from++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11549
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11550 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
11551 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11552
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11553
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11554 /* Compute the pixel height and width of IT->glyph_row.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11555
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11556 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
11557 to the max_ascent and max_height values of the display iterator
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11558 structure. This is not the case if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11559
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11560 1. We hit ZV without displaying anything. In this case, max_ascent
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11561 and max_height will be zero.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11562
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11563 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
11564 (The glyph row flag contributes_to_line_height_p is for future
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11565 pixmap extensions).
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11566
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11567 The first case is easily covered by using default values because in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11568 these cases, the line height does not really matter, except that it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11569 must not be zero. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11570
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11571 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11572 compute_line_metrics (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11573 struct it *it;
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_row *row = it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11576 int area, i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11577
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11578 if (FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11579 {
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11580 int i, header_line_height;
25012
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 /* The line may consist of one space only, that was added to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11583 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
11584 computed yet. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11585 if (row->height == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11586 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11587 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
11588 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
11589 row->ascent = it->max_ascent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11590 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
11591 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
11592 row->phys_height = it->max_phys_ascent + it->max_phys_descent;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11593 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11594
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11595 /* Compute the width of this line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11596 row->pixel_width = row->x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11597 for (i = 0; i < row->used[TEXT_AREA]; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11598 row->pixel_width += row->glyphs[TEXT_AREA][i].pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11599
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11600 xassert (row->pixel_width >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11601 xassert (row->ascent >= 0 && row->height > 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11602
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11603 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
11604 || 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
11605
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11606 /* 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
11607 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
11608 This makes accented characters fully visible. */
30652
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
11609 if (row == MATRIX_FIRST_TEXT_ROW (it->w->desired_matrix)
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11610 && row->phys_ascent > row->ascent)
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11611 {
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11612 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
11613 row->ascent = row->phys_ascent;
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11614 }
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11615
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11616 /* Compute how much of the line is visible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11617 row->visible_height = row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11618
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11619 header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (it->w);
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11620 if (row->y < header_line_height)
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11621 row->visible_height -= header_line_height - row->y;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11622 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11623 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11624 int max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (it->w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11625 if (row->y + row->height > max_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11626 row->visible_height -= row->y + row->height - max_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11627 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11628 }
6415
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
11629 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11630 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11631 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
11632 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
11633 row->height = row->phys_height = row->visible_height = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11634 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11635
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11636 /* Compute a hash code for this row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11637 row->hash = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11638 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11639 for (i = 0; i < row->used[area]; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11640 row->hash = ((((row->hash << 4) + (row->hash >> 24)) & 0x0fffffff)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11641 + row->glyphs[area][i].u.val
27000
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
11642 + row->glyphs[area][i].face_id
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
11643 + row->glyphs[area][i].padding_p
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11644 + (row->glyphs[area][i].type << 2));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11645
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11646 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
11647 it->max_phys_ascent = it->max_phys_descent = 0;
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11650
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11651 /* 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
11652 window-based redisplay. DEFAULT_FACE_P non-zero means let the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11653 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
11654 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
11655
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
11656 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
11657 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
11658 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
11659 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
11660
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
11661 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
11662 end of the line if the row ends in italic text. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11663
26255
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11664 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11665 append_space (it, default_face_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11666 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11667 int default_face_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11668 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11669 if (FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11670 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11671 int n = it->glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11672
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11673 if (it->glyph_row->glyphs[TEXT_AREA] + n
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11674 < it->glyph_row->glyphs[1 + TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11675 {
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11676 /* Save some values that must not be changed.
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11677 Must save IT->c and IT->len because otherwise
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11678 ITERATOR_AT_END_P wouldn't work anymore after
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11679 append_space has been called. */
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11680 int saved_what = it->what;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11681 int saved_c = it->c, saved_len = it->len;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11682 int saved_x = it->current_x;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11683 int saved_face_id = it->face_id;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11684 struct text_pos saved_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11685 Lisp_Object saved_object;
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11686 struct face *face;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11687
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11688 saved_object = it->object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11689 saved_pos = it->position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11690
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11691 it->what = IT_CHARACTER;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11692 bzero (&it->position, sizeof it->position);
28464
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
11693 it->object = make_number (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11694 it->c = ' ';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11695 it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11696
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11697 if (default_face_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11698 it->face_id = DEFAULT_FACE_ID;
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11699 face = FACE_FROM_ID (it->f, it->face_id);
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11700 it->face_id = FACE_FOR_CHAR (it->f, face, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11701
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11702 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11703
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11704 it->current_x = saved_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11705 it->object = saved_object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11706 it->position = saved_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11707 it->what = saved_what;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11708 it->face_id = saved_face_id;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11709 it->len = saved_len;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11710 it->c = saved_c;
26255
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11711 return 1;
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11712 }
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11713 }
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11714
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11715 return 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11716 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11717
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11718
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11719 /* 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
11720 to the end of the display line. Called from display_line.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11721 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
11722 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
11723
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11724 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11725 extend_face_to_end_of_line (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11726 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11727 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11728 struct face *face;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11729 struct frame *f = it->f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11730
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11731 /* If line is already filled, do nothing. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11732 if (it->current_x >= it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11733 return;
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 /* Face extension extends the background and box of IT->face_id
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11736 to the end of the line. If the background equals the background
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11737 of the frame, we haven't to do anything. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11738 face = FACE_FROM_ID (f, it->face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11739 if (FRAME_WINDOW_P (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11740 && face->box == FACE_NO_BOX
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11741 && face->background == FRAME_BACKGROUND_PIXEL (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11742 && !face->stipple)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11743 return;
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 /* 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
11746 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
11747 it->glyph_row->fill_line_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11748
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11749 /* If current character of IT is not ASCII, make sure we have the
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11750 ASCII face. This will be automatically undone the next time
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11751 get_next_display_element returns a multibyte character. Note
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11752 that the character will always be single byte in unibyte text. */
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11753 if (!SINGLE_BYTE_CHAR_P (it->c))
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11754 {
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11755 it->face_id = FACE_FOR_CHAR (f, face, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11756 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11757
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11758 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11759 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11760 /* 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
11761 so that we know which face to draw. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11762 if (it->glyph_row->used[TEXT_AREA] == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11763 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11764 it->glyph_row->glyphs[TEXT_AREA][0] = space_glyph;
27000
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
11765 it->glyph_row->glyphs[TEXT_AREA][0].face_id = it->face_id;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11766 it->glyph_row->used[TEXT_AREA] = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11767 }
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 else
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 /* Save some values that must not be changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11772 int saved_x = it->current_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11773 struct text_pos saved_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11774 Lisp_Object saved_object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11775 int saved_what = it->what;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11776
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11777 saved_object = it->object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11778 saved_pos = it->position;
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 it->what = IT_CHARACTER;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11781 bzero (&it->position, sizeof it->position);
28464
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
11782 it->object = make_number (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11783 it->c = ' ';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11784 it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11785
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11786 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11787
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11788 while (it->current_x <= it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11789 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11790
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11791 /* 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
11792 truncation glyph below and make us set the cursor on them, maybe. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11793 it->current_x = saved_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11794 it->object = saved_object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11795 it->position = saved_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11796 it->what = saved_what;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11797 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11798 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11799
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11800
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11801 /* 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
11802 trailing whitespace. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
11803
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
11804 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11805 trailing_whitespace_p (charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11806 int charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11807 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11808 int bytepos = CHAR_TO_BYTE (charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11809 int c = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11810
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11811 while (bytepos < ZV_BYTE
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11812 && (c = FETCH_CHAR (bytepos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11813 c == ' ' || c == '\t'))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11814 ++bytepos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11815
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
11816 if (bytepos >= ZV_BYTE || c == '\n' || c == '\r')
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
11817 {
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
11818 if (bytepos != PT_BYTE)
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
11819 return 1;
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
11820 }
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
11821 return 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11822 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11823
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11824
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11825 /* Highlight trailing whitespace, if any, in ROW. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11826
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11827 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11828 highlight_trailing_whitespace (f, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11829 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11830 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11831 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11832 int used = row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11833
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11834 if (used)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11835 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11836 struct glyph *start = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11837 struct glyph *glyph = start + used - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11838
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11839 /* Skip over the space glyph inserted to display the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11840 cursor at the end of a line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11841 if (glyph->type == CHAR_GLYPH
27000
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
11842 && glyph->u.ch == ' '
28464
cad4cc0508a0 Fix Lisp_Object/int type confusion revealed by making Lisp_Object a union type:
Ken Raeburn <raeburn@raeburn.org>
parents: 28362
diff changeset
11843 && INTEGERP (glyph->object))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11844 --glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11845
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11846 /* If last glyph is a space or stretch, and it's trailing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11847 whitespace, set the face of all trailing whitespace glyphs in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11848 IT->glyph_row to `trailing-whitespace'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11849 if (glyph >= start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11850 && BUFFERP (glyph->object)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11851 && (glyph->type == STRETCH_GLYPH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11852 || (glyph->type == CHAR_GLYPH
27000
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
11853 && glyph->u.ch == ' '))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11854 && trailing_whitespace_p (glyph->charpos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11855 {
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11856 int face_id = lookup_named_face (f, Qtrailing_whitespace, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11857
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11858 while (glyph >= start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11859 && BUFFERP (glyph->object)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11860 && (glyph->type == STRETCH_GLYPH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11861 || (glyph->type == CHAR_GLYPH
27000
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
11862 && glyph->u.ch == ' ')))
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
11863 (glyph--)->face_id = face_id;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11864 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11865 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11866 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11867
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11868
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11869 /* Value is non-zero if glyph row ROW in window W should be
33916
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
11870 used to hold the cursor. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11871
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11872 static int
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11873 cursor_row_p (w, row)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11874 struct window *w;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11875 struct glyph_row *row;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11876 {
32590
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11877 int cursor_row_p = 1;
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11878
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11879 if (PT == MATRIX_ROW_END_CHARPOS (row))
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11880 {
32590
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11881 /* If the row ends with a newline from a string, we don't want
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11882 the cursor there (if the row is continued it doesn't end in a
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11883 newline). */
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11884 if (CHARPOS (row->end.string_pos) >= 0
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11885 || MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row))
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11886 cursor_row_p = row->continued_p;
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11887
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11888 /* If the row ends at ZV, display the cursor at the end of that
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11889 row instead of at the start of the row below. */
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11890 else if (row->ends_at_zv_p)
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11891 cursor_row_p = 1;
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11892 else
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11893 cursor_row_p = 0;
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11894 }
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11895
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
11896 return cursor_row_p;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11897 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11898
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11899
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11900 /* Construct the glyph row IT->glyph_row in the desired matrix of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11901 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
11902 for an overview of struct it. Value is non-zero if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11903 IT->glyph_row displays text, as opposed to a line displaying ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11904 only. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11905
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11906 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11907 display_line (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11908 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11909 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11910 struct glyph_row *row = it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11911
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11912 /* We always start displaying at hpos zero even if hscrolled. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11913 xassert (it->hpos == 0 && it->current_x == 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11914
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11915 /* 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
11916 xassert (MATRIX_ROW_VPOS (row, it->w->desired_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11917 < it->w->desired_matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11918
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11919 /* Is IT->w showing the region? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11920 it->w->region_showing = it->region_beg_charpos > 0 ? Qt : Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11921
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11922 /* Clear the result glyph row and enable it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11923 prepare_desired_row (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11924
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11925 row->y = it->current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11926 row->start = it->current;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11927 row->continuation_lines_width = it->continuation_lines_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11928 row->displays_text_p = 1;
29473
80835e075d87 (display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents: 29461
diff changeset
11929 row->starts_in_middle_of_char_p = it->starts_in_middle_of_char_p;
80835e075d87 (display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents: 29461
diff changeset
11930 it->starts_in_middle_of_char_p = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11931
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
11932 /* Arrange the overlays nicely for our purposes. Usually, we call
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11933 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
11934 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
11935 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
11936 recenter_overlay_lists but the first will be pretty cheap. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11937 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11938
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11939 /* Move over display elements that are not visible because we are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11940 hscrolled. This may stop at an x-position < IT->first_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11941 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
11942 if (it->current_x < it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11943 move_it_in_display_line_to (it, ZV, it->first_visible_x,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11944 MOVE_TO_POS | MOVE_TO_X);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11945
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11946 /* Get the initial row height. This is either the height of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11947 text hscrolled, if there is any, or zero. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11948 row->ascent = it->max_ascent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11949 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
11950 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
11951 row->phys_height = it->max_phys_ascent + it->max_phys_descent;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11952
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11953 /* Loop generating characters. The loop is left with IT on the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11954 character to display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11955 while (1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11956 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11957 int n_glyphs_before, hpos_before, x_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11958 int x, i, nglyphs;
31506
a1d733428491 (dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents: 31493
diff changeset
11959 int ascent = 0, descent = 0, phys_ascent = 0, phys_descent = 0;
30652
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
11960
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11961 /* Retrieve the next thing to display. Value is zero if end of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11962 buffer reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11963 if (!get_next_display_element (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11964 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11965 /* Maybe add a space at the end of this line that is used to
26301
12ddeb9a6efd (display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents: 26258
diff changeset
11966 display the cursor there under X. Set the charpos of the
12ddeb9a6efd (display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents: 26258
diff changeset
11967 first glyph of blank lines not corresponding to any text
12ddeb9a6efd (display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents: 26258
diff changeset
11968 to -1. */
12ddeb9a6efd (display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents: 26258
diff changeset
11969 if ((append_space (it, 1) && row->used[TEXT_AREA] == 1)
12ddeb9a6efd (display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents: 26258
diff changeset
11970 || row->used[TEXT_AREA] == 0)
12ddeb9a6efd (display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents: 26258
diff changeset
11971 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11972 row->glyphs[TEXT_AREA]->charpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11973 row->displays_text_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11974
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11975 if (!NILP (XBUFFER (it->w->buffer)->indicate_empty_lines))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11976 row->indicate_empty_line_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11977 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11978
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11979 it->continuation_lines_width = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11980 row->ends_at_zv_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11981 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11982 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11983
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11984 /* Now, get the metrics of what we want to display. This also
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11985 generates glyphs in `row' (which is IT->glyph_row). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11986 n_glyphs_before = row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11987 x = it->current_x;
28723
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
11988
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
11989 /* Remember the line height so far in case the next element doesn't
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
11990 fit on the line. */
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
11991 if (!it->truncate_lines_p)
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
11992 {
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
11993 ascent = it->max_ascent;
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
11994 descent = it->max_descent;
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
11995 phys_ascent = it->max_phys_ascent;
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
11996 phys_descent = it->max_phys_descent;
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
11997 }
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
11998
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11999 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12000
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12001 /* If this display element was in marginal areas, continue with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12002 the next one. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12003 if (it->area != TEXT_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12004 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12005 row->ascent = max (row->ascent, it->max_ascent);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12006 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
12007 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
12008 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
12009 it->max_phys_ascent + it->max_phys_descent);
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12010 set_iterator_to_next (it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12011 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12012 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12013
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12014 /* Does the display element fit on the line? If we truncate
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12015 lines, we should draw past the right edge of the window. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12016 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
12017 continuation glyph before the right margin. If lines are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12018 continued, there are two possible strategies for characters
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12019 resulting in more than 1 glyph (e.g. tabs): Display as many
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12020 glyphs as possible in this line and leave the rest for the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12021 continuation line, or display the whole element in the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12022 line. Original redisplay did the former, so we do it also. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12023 nglyphs = row->used[TEXT_AREA] - n_glyphs_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12024 hpos_before = it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12025 x_before = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12026
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12027 if (nglyphs == 1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12028 && it->current_x < it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12029 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12030 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12031 row->ascent = max (row->ascent, it->max_ascent);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12032 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
12033 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
12034 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
12035 it->max_phys_ascent + it->max_phys_descent);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12036 if (it->current_x - it->pixel_width < it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12037 row->x = x - it->first_visible_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12038 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12039 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12040 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12041 int new_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12042 struct glyph *glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12043
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12044 for (i = 0; i < nglyphs; ++i, x = new_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12045 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12046 glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12047 new_x = x + glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12048
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12049 if (/* Lines are continued. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12050 !it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12051 && (/* Glyph doesn't fit on the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12052 new_x > it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12053 /* Or it fits exactly on a window system frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12054 || (new_x == it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12055 && FRAME_WINDOW_P (it->f))))
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
12056 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12057 /* End of a continued line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12058
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12059 if (it->hpos == 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12060 || (new_x == it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12061 && FRAME_WINDOW_P (it->f)))
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
12062 {
28723
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12063 /* Current glyph is the only one on the line or
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12064 fits exactly on the line. We must continue
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12065 the line because we can't draw the cursor
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12066 after the glyph. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12067 row->continued_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12068 it->current_x = new_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12069 it->continuation_lines_width += new_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12070 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12071 if (i == nglyphs - 1)
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12072 set_iterator_to_next (it, 1);
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
12073 }
29461
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12074 else if (CHAR_GLYPH_PADDING_P (*glyph)
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12075 && !FRAME_WINDOW_P (it->f))
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12076 {
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12077 /* A padding glyph that doesn't fit on this line.
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12078 This means the whole character doesn't fit
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12079 on the line. */
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12080 row->used[TEXT_AREA] = n_glyphs_before;
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12081
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12082 /* Fill the rest of the row with continuation
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12083 glyphs like in 20.x. */
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12084 while (row->glyphs[TEXT_AREA] + row->used[TEXT_AREA]
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12085 < row->glyphs[1 + TEXT_AREA])
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12086 produce_special_glyphs (it, IT_CONTINUATION);
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12087
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12088 row->continued_p = 1;
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12089 it->current_x = x_before;
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12090 it->continuation_lines_width += x_before;
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12091
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12092 /* Restore the height to what it was before the
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12093 element not fitting on the line. */
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12094 it->max_ascent = ascent;
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12095 it->max_descent = descent;
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12096 it->max_phys_ascent = phys_ascent;
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12097 it->max_phys_descent = phys_descent;
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12098 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12099 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12100 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12101 /* Display element draws past the right edge of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12102 the window. Restore positions to values
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12103 before the element. The next line starts
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12104 with current_x before the glyph that could
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12105 not be displayed, so that TAB works right. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12106 row->used[TEXT_AREA] = n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12107
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12108 /* Display continuation glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12109 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12110 produce_special_glyphs (it, IT_CONTINUATION);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12111 row->continued_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12112
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12113 it->current_x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12114 it->continuation_lines_width += x;
29473
80835e075d87 (display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents: 29461
diff changeset
12115 if (nglyphs > 1 && i > 0)
80835e075d87 (display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents: 29461
diff changeset
12116 {
80835e075d87 (display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents: 29461
diff changeset
12117 row->ends_in_middle_of_char_p = 1;
80835e075d87 (display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents: 29461
diff changeset
12118 it->starts_in_middle_of_char_p = 1;
80835e075d87 (display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents: 29461
diff changeset
12119 }
28723
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12120
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12121 /* Restore the height to what it was before the
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12122 element not fitting on the line. */
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12123 it->max_ascent = ascent;
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12124 it->max_descent = descent;
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12125 it->max_phys_ascent = phys_ascent;
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12126 it->max_phys_descent = phys_descent;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12127 }
28723
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12128
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12129 break;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
12130 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12131 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
12132 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12133 /* Increment number of glyphs actually displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12134 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12135
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12136 if (x < it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12137 /* Glyph is partially visible, i.e. row starts at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12138 negative X position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12139 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
12140 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12141 else
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
12142 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12143 /* Glyph is completely off the left margin of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12144 window. This should not happen because of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12145 move_it_in_display_line at the start of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12146 this function. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12147 abort ();
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
12148 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
12149 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12150
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12151 row->ascent = max (row->ascent, it->max_ascent);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12152 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
12153 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
12154 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
12155 it->max_phys_ascent + it->max_phys_descent);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12156
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12157 /* End of this display line if row is continued. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12158 if (row->continued_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12159 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12160 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12161
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12162 /* 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
12163 sure that a non-default face is extended up to the right
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12164 margin of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12165 if (ITERATOR_AT_END_OF_LINE_P (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12166 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12167 int used_before = row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12168
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12169 /* 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
12170 display the cursor there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12171 append_space (it, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12172
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12173 /* Extend the face to the end of the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12174 extend_face_to_end_of_line (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12175
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12176 /* Make sure we have the position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12177 if (used_before == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12178 row->glyphs[TEXT_AREA]->charpos = CHARPOS (it->position);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12179
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12180 /* Consume the line end. This skips over invisible lines. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12181 set_iterator_to_next (it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12182 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
12183 break;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12184 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12185
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12186 /* Proceed with next display element. Note that this skips
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12187 over lines invisible because of selective display. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12188 set_iterator_to_next (it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12189
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12190 /* If we truncate lines, we are done when the last displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12191 glyphs reach past the right margin of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12192 if (it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12193 && (FRAME_WINDOW_P (it->f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12194 ? (it->current_x >= it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12195 : (it->current_x > it->last_visible_x)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12196 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12197 /* Maybe add truncation glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12198 if (!FRAME_WINDOW_P (it->f))
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12199 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12200 --it->glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12201 produce_special_glyphs (it, IT_TRUNCATION);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12202 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12203
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12204 row->truncated_on_right_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12205 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
12206 reseat_at_next_visible_line_start (it, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12207 row->ends_at_zv_p = FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12208 it->hpos = hpos_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12209 it->current_x = x_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12210 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12211 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12212 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12213
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12214 /* If line is not empty and hscrolled, maybe insert truncation glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12215 at the left window margin. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12216 if (it->first_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12217 && IT_CHARPOS (*it) != MATRIX_ROW_START_CHARPOS (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12218 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12219 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12220 insert_left_trunc_glyphs (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12221 row->truncated_on_left_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12222 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12223
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12224 /* If the start of this line is the overlay arrow-position, then
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12225 mark this glyph row as the one containing the overlay arrow.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12226 This is clearly a mess with variable size fonts. It would be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12227 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
12228 if (MARKERP (Voverlay_arrow_position)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12229 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12230 && (MATRIX_ROW_START_CHARPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12231 == 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
12232 && STRINGP (Voverlay_arrow_string)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12233 && ! overlay_arrow_seen)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12234 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12235 /* Overlay arrow in window redisplay is a bitmap. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12236 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12237 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12238 struct glyph_row *arrow_row = get_overlay_arrow_glyph_row (it->w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12239 struct glyph *glyph = arrow_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12240 struct glyph *arrow_end = glyph + arrow_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12241 struct glyph *p = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12242 struct glyph *p2, *end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12243
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12244 /* Copy the arrow glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12245 while (glyph < arrow_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12246 *p++ = *glyph++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12247
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12248 /* Throw away padding glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12249 p2 = p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12250 end = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12251 while (p2 < end && CHAR_GLYPH_PADDING_P (*p2))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12252 ++p2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12253 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
12254 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12255 while (p2 < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12256 *p++ = *p2++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12257 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
12258 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12259 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12260
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12261 overlay_arrow_seen = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12262 row->overlay_arrow_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12263 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12264
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12265 /* Compute pixel dimensions of this line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12266 compute_line_metrics (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12267
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12268 /* Remember the position at which this line ends. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12269 row->end = it->current;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12270
29481
b36d76033c9d (display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents: 29473
diff changeset
12271 /* Maybe set the cursor. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12272 if (it->w->cursor.vpos < 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12273 && PT >= MATRIX_ROW_START_CHARPOS (row)
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12274 && PT <= MATRIX_ROW_END_CHARPOS (row)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12275 && cursor_row_p (it->w, row))
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12276 set_cursor_from_row (it->w, row, it->w->desired_matrix, 0, 0, 0, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12277
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12278 /* Highlight trailing whitespace. */
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
12279 if (!NILP (Vshow_trailing_whitespace))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12280 highlight_trailing_whitespace (it->f, it->glyph_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12281
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12282 /* Prepare for the next line. This line starts horizontally at (X
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12283 HPOS) = (0 0). Vertical positions are incremented. As a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12284 convenience for the caller, IT->glyph_row is set to the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12285 row to be used. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12286 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12287 it->current_y += row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12288 ++it->vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12289 ++it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12290 return row->displays_text_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12291 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12292
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12293
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12294
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12295 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12296 Menu Bar
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12297 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12298
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12299 /* Redisplay the menu bar in the frame for window W.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12300
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12301 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
12302 displayed in a special window W->frame->menu_bar_window.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12303
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12304 The menu bar of terminal frames is treated specially as far as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12305 glyph matrices are concerned. Menu bar lines are not part of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12306 windows, so the update is done directly on the frame matrix rows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12307 for the menu bar. */
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
12308
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
12309 static void
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
12310 display_menu_bar (w)
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
12311 struct window *w;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
12312 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12313 struct frame *f = XFRAME (WINDOW_FRAME (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12314 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12315 Lisp_Object items;
6134
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
12316 int i;
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
12317
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12318 /* 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
12319 #ifdef HAVE_NTGUI
15245
4bfe3c580496 (display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents: 15111
diff changeset
12320 if (!NILP (Vwindow_system))
4bfe3c580496 (display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents: 15111
diff changeset
12321 return;
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
12322 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12323 #ifdef USE_X_TOOLKIT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12324 if (FRAME_X_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12325 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12326 #endif
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
12327 #ifdef macintosh
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
12328 if (FRAME_MAC_P (f))
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
12329 return;
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
12330 #endif
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
12331
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
12332 #ifdef USE_X_TOOLKIT
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12333 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
12334 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
12335 it.first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12336 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12337 #else /* not USE_X_TOOLKIT */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12338 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12339 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12340 /* Menu bar lines are displayed in the desired matrix of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12341 dummy window menu_bar_window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12342 struct window *menu_w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12343 xassert (WINDOWP (f->menu_bar_window));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12344 menu_w = XWINDOW (f->menu_bar_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12345 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
12346 MENU_FACE_ID);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12347 it.first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12348 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12349 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12350 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12351 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12352 /* 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
12353 pixel x/y. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12354 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
12355 MENU_FACE_ID);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12356 it.first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12357 it.last_visible_x = FRAME_WIDTH (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12358 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12359 #endif /* not USE_X_TOOLKIT */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12360
33840
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
12361 if (! mode_line_inverse_video)
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
12362 /* Force the menu-bar to be displayed in the default face. */
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
12363 it.base_face_id = it.face_id = DEFAULT_FACE_ID;
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
12364
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12365 /* Clear all rows of the menu bar. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12366 for (i = 0; i < FRAME_MENU_BAR_LINES (f); ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12367 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12368 struct glyph_row *row = it.glyph_row + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12369 clear_glyph_row (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12370 row->enabled_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12371 row->full_width_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12372 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12373
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12374 /* Display all items of the menu bar. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12375 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
12376 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
12377 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12378 Lisp_Object string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12379
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12380 /* 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
12381 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
12382 if (NILP (string))
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
12383 break;
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
12384
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12385 /* Remember where item was displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12386 XSETFASTINT (XVECTOR (items)->contents[i + 3], it.hpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12387
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12388 /* Display the item, pad with one space. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12389 if (it.current_x < it.last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12390 display_string (NULL, string, Qnil, 0, 0, &it,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12391 XSTRING (string)->size + 1, 0, 0, -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12392 }
2189
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
12393
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
12394 /* Fill out the line with spaces. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12395 if (it.current_x < it.last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12396 display_string ("", Qnil, Qnil, 0, 0, &it, -1, 0, 0, -1);
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 /* Compute the total height of the lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12399 compute_line_metrics (&it);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12402
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
12403
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12404 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12405 Mode Line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12406 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12407
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12408 /* Redisplay mode lines in the window tree whose root is WINDOW. If
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12409 FORCE is non-zero, redisplay mode lines unconditionally.
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12410 Otherwise, redisplay only mode lines that are garbaged. Value is
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12411 the number of windows whose mode lines were redisplayed. */
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12412
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12413 static int
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12414 redisplay_mode_lines (window, force)
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12415 Lisp_Object window;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12416 int force;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12417 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12418 int nwindows = 0;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12419
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12420 while (!NILP (window))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12421 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12422 struct window *w = XWINDOW (window);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12423
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12424 if (WINDOWP (w->hchild))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12425 nwindows += redisplay_mode_lines (w->hchild, force);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12426 else if (WINDOWP (w->vchild))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12427 nwindows += redisplay_mode_lines (w->vchild, force);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12428 else if (force
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12429 || FRAME_GARBAGED_P (XFRAME (w->frame))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12430 || !MATRIX_MODE_LINE_ROW (w->current_matrix)->enabled_p)
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12431 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12432 Lisp_Object old_selected_frame;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12433 struct text_pos lpoint;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12434 struct buffer *old = current_buffer;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12435
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12436 /* Set the window's buffer for the mode line display. */
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12437 SET_TEXT_POS (lpoint, PT, PT_BYTE);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12438 set_buffer_internal_1 (XBUFFER (w->buffer));
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12439
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12440 /* Point refers normally to the selected window. For any
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12441 other window, set up appropriate value. */
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12442 if (!EQ (window, selected_window))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12443 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12444 struct text_pos pt;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12445
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12446 SET_TEXT_POS_FROM_MARKER (pt, w->pointm);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12447 if (CHARPOS (pt) < BEGV)
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12448 TEMP_SET_PT_BOTH (BEGV, BEGV_BYTE);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12449 else if (CHARPOS (pt) > (ZV - 1))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12450 TEMP_SET_PT_BOTH (ZV, ZV_BYTE);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12451 else
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12452 TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt));
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12453 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12454
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12455 /* Temporarily set up the selected frame. */
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12456 old_selected_frame = selected_frame;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12457 selected_frame = w->frame;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12458
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12459 /* Display mode lines. */
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12460 clear_glyph_matrix (w->desired_matrix);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12461 if (display_mode_lines (w))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12462 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12463 ++nwindows;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12464 w->must_be_updated_p = 1;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12465 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12466
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12467 /* Restore old settings. */
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12468 selected_frame = old_selected_frame;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12469 set_buffer_internal_1 (old);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12470 TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint));
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12471 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12472
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12473 window = w->next;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12474 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12475
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12476 return nwindows;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12477 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12478
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12479
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12480 /* Display the mode and/or top line of window W. Value is the number
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12481 of mode lines displayed. */
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12482
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12483 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12484 display_mode_lines (w)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12485 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12486 {
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12487 int n = 0;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12488
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12489 /* 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
12490 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
12491 w->column_number_displayed = Qnil;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12492
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12493 if (WINDOW_WANTS_MODELINE_P (w))
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12494 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12495 display_mode_line (w, MODE_LINE_FACE_ID,
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12496 current_buffer->mode_line_format);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12497 ++n;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12498 }
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
12499
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
12500 if (WINDOW_WANTS_HEADER_LINE_P (w))
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12501 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12502 display_mode_line (w, HEADER_LINE_FACE_ID,
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12503 current_buffer->header_line_format);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12504 ++n;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12505 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12506
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12507 return n;
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12511 /* Display mode or top line of window W. FACE_ID specifies which line
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
12512 to display; it is either MODE_LINE_FACE_ID or HEADER_LINE_FACE_ID.
33462
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
12513 FORMAT is the mode line format to display. Value is the pixel
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
12514 height of the mode line displayed. */
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
12515
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
12516 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12517 display_mode_line (w, face_id, format)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12518 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12519 enum face_id face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12520 Lisp_Object format;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12521 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12522 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12523 struct face *face;
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 init_iterator (&it, w, -1, -1, NULL, face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12526 prepare_desired_row (it.glyph_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12527
33840
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
12528 if (! mode_line_inverse_video)
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
12529 /* Force the mode-line to be displayed in the default face. */
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
12530 it.base_face_id = it.face_id = DEFAULT_FACE_ID;
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
12531
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12532 /* Temporarily make frame's keyboard the current kboard so that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12533 kboard-local variables in the mode_line_format will get the right
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12534 values. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12535 push_frame_kboard (it.f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12536 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
12537 pop_frame_kboard ();
17f7be3e2443 (display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents: 11291
diff changeset
12538
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12539 /* Fill up with spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12540 display_string (" ", Qnil, Qnil, 0, 0, &it, 10000, -1, -1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12541
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12542 compute_line_metrics (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12543 it.glyph_row->full_width_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12544 it.glyph_row->mode_line_p = 1;
33840
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
12545 it.glyph_row->inverse_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12546 it.glyph_row->continued_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12547 it.glyph_row->truncated_on_left_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12548 it.glyph_row->truncated_on_right_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12549
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12550 /* Make a 3D mode-line have a shadow at its right end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12551 face = FACE_FROM_ID (it.f, face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12552 extend_face_to_end_of_line (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12553 if (face->box != FACE_NO_BOX)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12554 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12555 struct glyph *last = (it.glyph_row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12556 + it.glyph_row->used[TEXT_AREA] - 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12557 last->right_box_line_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12558 }
33462
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
12559
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
12560 return it.glyph_row->height;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12561 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12562
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12563
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12564 /* Contribute ELT to the mode line for window IT->w. How it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12565 translates into text depends on its data type.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12566
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12567 IT describes the display environment in which we display, as usual.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12568
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12569 DEPTH is the depth in recursion. It is used to prevent
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12570 infinite recursion here.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12571
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12572 FIELD_WIDTH is the number of characters the display of ELT should
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12573 occupy in the mode line, and PRECISION is the maximum number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12574 characters to display from ELT's representation. See
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12575 display_string for details. *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12576
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12577 Returns the hpos of the end of the text generated by ELT. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12578
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12579 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12580 display_mode_element (it, depth, field_width, precision, elt)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12581 struct it *it;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12582 int depth;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12583 int field_width, precision;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12584 Lisp_Object elt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12585 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12586 int n = 0, field, prec;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12587
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12588 tail_recurse:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12589 if (depth > 10)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12590 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12591
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12592 depth++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12593
10457
2ab3bd0288a9 Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents: 10442
diff changeset
12594 switch (SWITCH_ENUM_CAST (XTYPE (elt)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12595 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12596 case Lisp_String:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12597 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12598 /* A string: output it and check for %-constructs within it. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12599 unsigned char c;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12600 unsigned char *this = XSTRING (elt)->data;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12601 unsigned char *lisp_string = this;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12602
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12603 while ((precision <= 0 || n < precision)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12604 && *this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12605 && (frame_title_ptr
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12606 || it->current_x < it->last_visible_x))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12607 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12608 unsigned char *last = this;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12609
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12610 /* Advance to end of string or next format specifier. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12611 while ((c = *this++) != '\0' && c != '%')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12612 ;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12613
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12614 if (this - 1 != last)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12615 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12616 /* Output to end of string or up to '%'. Field width
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12617 is length of string. Don't output more than
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12618 PRECISION allows us. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12619 prec = --this - last;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12620 if (precision > 0 && prec > precision - n)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12621 prec = precision - n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12622
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12623 if (frame_title_ptr)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12624 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
12625 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12626 n += display_string (NULL, elt, Qnil, 0, last - lisp_string,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12627 it, 0, prec, 0, -1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12628 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12629 else /* c == '%' */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12630 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12631 unsigned char *percent_position = this;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12632
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12633 /* Get the specified minimum width. Zero means
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12634 don't pad. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12635 field = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12636 while ((c = *this++) >= '0' && c <= '9')
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12637 field = field * 10 + c - '0';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12638
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12639 /* Don't pad beyond the total padding allowed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12640 if (field_width - n > 0 && field > field_width - n)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12641 field = field_width - n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12642
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12643 /* Note that either PRECISION <= 0 or N < PRECISION. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12644 prec = precision - n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12645
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12646 if (c == 'M')
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12647 n += display_mode_element (it, depth, field, prec,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12648 Vglobal_mode_string);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12649 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
12650 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12651 unsigned char *spec
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12652 = decode_mode_spec (it->w, c, field, prec);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12653
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12654 if (frame_title_ptr)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12655 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
12656 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12657 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12658 int nglyphs_before
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12659 = it->glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12660 int charpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12661 = percent_position - XSTRING (elt)->data;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12662 int nwritten
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12663 = display_string (spec, Qnil, elt, charpos, 0, it,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12664 field, prec, 0, -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12665
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12666 /* Assign to the glyphs written above the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12667 string where the `%x' came from, position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12668 of the `%'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12669 if (nwritten > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12670 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12671 struct glyph *glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12672 = (it->glyph_row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12673 + nglyphs_before);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12674 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12675
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12676 for (i = 0; i < nwritten; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12677 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12678 glyph[i].object = elt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12679 glyph[i].charpos = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12680 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12681
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12682 n += nwritten;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12683 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12684 }
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12685 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12686 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12687 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12688 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12689 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12690
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12691 case Lisp_Symbol:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12692 /* A symbol: process the value of the symbol recursively
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12693 as if it appeared here directly. Avoid error if symbol void.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12694 Special case: if value of symbol is a string, output the string
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12695 literally. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12696 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12697 register Lisp_Object tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12698 tem = Fboundp (elt);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
12699 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12700 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12701 tem = Fsymbol_value (elt);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12702 /* If value is a string, output that string literally:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12703 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
12704 if (STRINGP (tem))
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12705 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12706 prec = XSTRING (tem)->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12707 if (precision > 0 && prec > precision - n)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12708 prec = precision - n;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12709 if (frame_title_ptr)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12710 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
12711 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12712 n += display_string (NULL, tem, Qnil, 0, 0, it,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12713 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
12714 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12715 else if (!EQ (tem, elt))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12716 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12717 /* Give up right away for nil or t. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12718 elt = tem;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12719 goto tail_recurse;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12720 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12721 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12722 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12723 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12724
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12725 case Lisp_Cons:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12726 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12727 register Lisp_Object car, tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12728
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12729 /* A cons cell: three distinct cases.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12730 If first element is a string or a cons, process all the elements
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12731 and effectively concatenate them.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12732 If first element is a negative number, truncate displaying cdr to
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12733 at most that many characters. If positive, pad (with spaces)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12734 to at least that many characters.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12735 If first element is a symbol, process the cadr or caddr recursively
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12736 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
12737 car = XCAR (elt);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12738 if (EQ (car, QCeval) && CONSP (XCDR (elt)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12739 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12740 /* An element of the form (:eval FORM) means evaluate FORM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12741 and use the result as mode line elements. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12742 struct gcpro gcpro1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12743 Lisp_Object spec;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12744
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
12745 spec = safe_eval (XCAR (XCDR (elt)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12746 GCPRO1 (spec);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12747 n += display_mode_element (it, depth, field_width - n,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12748 precision - n, spec);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12749 UNGCPRO;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12750 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12751 else if (SYMBOLP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12752 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12753 tem = Fboundp (car);
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12754 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
12755 if (!CONSP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12756 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12757 /* elt is now the cdr, and we know it is a cons cell.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12758 Use its car if CAR has a non-nil value. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
12759 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12760 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12761 tem = Fsymbol_value (car);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
12762 if (!NILP (tem))
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12763 {
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12764 elt = XCAR (elt);
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12765 goto tail_recurse;
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12766 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12767 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12768 /* Symbol's value is nil (or symbol is unbound)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12769 Get the cddr of the original list
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12770 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
12771 elt = XCDR (elt);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
12772 if (NILP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12773 break;
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
12774 else if (!CONSP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12775 goto invalid;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12776 elt = XCAR (elt);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12777 goto tail_recurse;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12778 }
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
12779 else if (INTEGERP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12780 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12781 register int lim = XINT (car);
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12782 elt = XCDR (elt);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12783 if (lim < 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12784 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12785 /* Negative int means reduce maximum width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12786 if (precision <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12787 precision = -lim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12788 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12789 precision = min (precision, -lim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12790 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12791 else if (lim > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12792 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12793 /* Padding specified. Don't let it be more than
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12794 current maximum. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12795 if (precision > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12796 lim = min (precision, lim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12797
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12798 /* If that's more padding than already wanted, queue it.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12799 But don't reduce padding already specified even if
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12800 that is beyond the current truncation point. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12801 field_width = max (lim, field_width);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12802 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12803 goto tail_recurse;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12804 }
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
12805 else if (STRINGP (car) || CONSP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12806 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12807 register int limit = 50;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12808 /* Limit is to protect against circular lists. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12809 while (CONSP (elt)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12810 && --limit > 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12811 && (precision <= 0 || n < precision))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12812 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12813 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
12814 precision - n, XCAR (elt));
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12815 elt = XCDR (elt);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12816 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12817 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12818 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12819 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12820
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12821 default:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12822 invalid:
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12823 if (frame_title_ptr)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12824 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
12825 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12826 n += display_string ("*invalid*", Qnil, Qnil, 0, 0, it, 0,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12827 precision - n, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12828 return n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12829 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12830
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12831 /* Pad to FIELD_WIDTH. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12832 if (field_width > 0 && n < field_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12833 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12834 if (frame_title_ptr)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12835 n += store_frame_title ("", field_width - n, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12836 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12837 n += display_string ("", Qnil, Qnil, 0, 0, it, field_width - n,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12838 0, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12839 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12840
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12841 return n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12842 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12843
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12844
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12845 /* 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
12846 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
12847
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12848 static void
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12849 pint2str (buf, width, d)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12850 register char *buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12851 register int width;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12852 register int d;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12853 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12854 register char *p = buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12855
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12856 if (d <= 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12857 *p++ = '0';
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12858 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12859 {
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12860 while (d > 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12861 {
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12862 *p++ = d % 10 + '0';
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12863 d /= 10;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12864 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12865 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12866
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12867 for (width -= (int) (p - buf); width > 0; --width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12868 *p++ = ' ';
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12869 *p-- = '\0';
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12870 while (p > buf)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12871 {
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12872 d = *buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12873 *buf++ = *p;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
12874 *p-- = d;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12875 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12878 /* 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
12879 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
12880 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
12881
24868
de2065294ca3 (invalid_eol_type): Make it unsigned.
Karl Heuer <kwzh@gnu.org>
parents: 24711
diff changeset
12882 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
12883
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12884 static char *
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12885 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
12886 Lisp_Object coding_system;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12887 register char *buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12888 int eol_flag;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12889 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
12890 Lisp_Object val;
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
12891 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
12892 unsigned char *eol_str;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12893 int eol_str_len;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12894 /* The EOL conversion we are using. */
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12895 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
12896
27721
c2a9f4621f9a (decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents: 27681
diff changeset
12897 val = Fget (coding_system, Qcoding_system);
31610
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
12898 eoltype = Qnil;
27721
c2a9f4621f9a (decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents: 27681
diff changeset
12899
c2a9f4621f9a (decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents: 27681
diff changeset
12900 if (!VECTORP (val)) /* Not yet decided. */
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12901 {
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
12902 if (multibyte)
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
12903 *buf++ = '-';
18677
7648eb8e46d2 (decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents: 18653
diff changeset
12904 if (eol_flag)
24215
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12905 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
12906 /* 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
12907 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12908 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12909 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
12910 Lisp_Object eolvalue;
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
12911
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
12912 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
12913
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
12914 if (multibyte)
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
12915 *buf++ = XFASTINT (XVECTOR (val)->contents[1]);
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
12916
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12917 if (eol_flag)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12918 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
12919 /* 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
12920
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
12921 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
12922 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
12923 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
12924 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
12925 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
12926 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
12927 ? eol_mnemonic_unix
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
12928 : (XFASTINT (eolvalue) == 1
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
12929 ? eol_mnemonic_dos : eol_mnemonic_mac));
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12930 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12931 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12932
24215
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12933 if (eol_flag)
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12934 {
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12935 /* 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
12936 if (STRINGP (eoltype))
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12937 {
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12938 eol_str = XSTRING (eoltype)->data;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12939 eol_str_len = XSTRING (eoltype)->size;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12940 }
24511
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
12941 else if (INTEGERP (eoltype)
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
12942 && CHAR_VALID_P (XINT (eoltype), 0))
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
12943 {
27721
c2a9f4621f9a (decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents: 27681
diff changeset
12944 eol_str = (unsigned char *) alloca (MAX_MULTIBYTE_LENGTH);
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
12945 eol_str_len = CHAR_STRING (XINT (eoltype), eol_str);
24511
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
12946 }
24215
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12947 else
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12948 {
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12949 eol_str = invalid_eol_type;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12950 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
12951 }
24511
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
12952 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
12953 buf += eol_str_len;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12954 }
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
12955
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12956 return buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12957 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12958
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12959 /* 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
12960 generated by character C. PRECISION >= 0 means don't return a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12961 string longer than that value. FIELD_WIDTH > 0 means pad the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12962 string returned with spaces to that value. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12963
1017
d42877206c0a * xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents: 973
diff changeset
12964 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
12965
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12966 static char *
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12967 decode_mode_spec (w, c, field_width, precision)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12968 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
12969 register int c;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12970 int field_width, precision;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12971 {
6518
07ecb7a5c916 (x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6415
diff changeset
12972 Lisp_Object obj;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12973 struct frame *f = XFRAME (WINDOW_FRAME (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12974 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
12975 struct buffer *b = XBUFFER (w->buffer);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12976
6518
07ecb7a5c916 (x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6415
diff changeset
12977 obj = Qnil;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12978
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12979 switch (c)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12980 {
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12981 case '*':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12982 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
12983 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12984 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
12985 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12986 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12987
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12988 case '+':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12989 /* 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
12990 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
12991 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12992 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
12993 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12994 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12995
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12996 case '&':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
12997 /* 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
12998 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
12999 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13000 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13001
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13002 case '%':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13003 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13004
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13005 case '[':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13006 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13007 int i;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13008 char *p;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13009
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13010 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
13011 return "[[[... ";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13012 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
13013 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
13014 *p++ = '[';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13015 *p = 0;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13016 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
13017 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13018
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13019 case ']':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13020 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13021 int i;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13022 char *p;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13023
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13024 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
13025 return " ...]]]";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13026 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
13027 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
13028 *p++ = ']';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13029 *p = 0;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13030 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
13031 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13032
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13033 case '-':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13034 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13035 register int i;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13036
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13037 /* Let lots_of_dashes be a string of infinite length. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13038 if (field_width <= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13039 || field_width > sizeof (lots_of_dashes))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13040 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13041 for (i = 0; i < FRAME_MESSAGE_BUF_SIZE (f) - 1; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13042 decode_mode_spec_buf[i] = '-';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13043 decode_mode_spec_buf[i] = '\0';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13044 return decode_mode_spec_buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13045 }
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13046 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13047 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
13048 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13049
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13050 case 'b':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13051 obj = b->name;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13052 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13053
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13054 case 'c':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13055 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13056 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
13057 XSETFASTINT (w->column_number_displayed, col);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13058 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
13059 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
13060 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13061
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13062 case 'F':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13063 /* %F displays the frame name. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13064 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
13065 return (char *) XSTRING (f->title)->data;
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
13066 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
13067 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
13068 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
13069
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13070 case 'f':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13071 obj = b->filename;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13072 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13073
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13074 case 'l':
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13075 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13076 int startpos = XMARKER (w->start)->charpos;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13077 int startpos_byte = marker_byte_position (w->start);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13078 int line, linepos, linepos_byte, topline;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13079 int nlines, junk;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13080 int height = XFASTINT (w->height);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13081
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13082 /* 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
13083 don't forget that too fast. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13084 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
13085 goto no_value;
16463
c6a338fd1938 (decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents: 16397
diff changeset
13086 /* 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
13087 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
13088 w->base_line_pos = Qnil;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13089
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13090 /* If the buffer is very big, don't waste time. */
29698
9ad6e18de5f7 * xdisp.c (decode_mode_spec): Fix sense of test whether Vline_number_display_limit is an integer.
Ken Raeburn <raeburn@raeburn.org>
parents: 29697
diff changeset
13091 if (INTEGERP (Vline_number_display_limit)
29632
96d83d5a48b3 (Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 29515
diff changeset
13092 && BUF_ZV (b) - BUF_BEGV (b) > XINT (Vline_number_display_limit))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13093 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13094 w->base_line_pos = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13095 w->base_line_number = Qnil;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13096 goto no_value;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13097 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13098
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13099 if (!NILP (w->base_line_number)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13100 && !NILP (w->base_line_pos)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13101 && XFASTINT (w->base_line_pos) <= startpos)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13102 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13103 line = XFASTINT (w->base_line_number);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13104 linepos = XFASTINT (w->base_line_pos);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13105 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
13106 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13107 else
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13108 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13109 line = 1;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13110 linepos = BUF_BEGV (b);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13111 linepos_byte = BUF_BEGV_BYTE (b);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13112 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13113
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13114 /* 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
13115 nlines = display_count_lines (linepos, linepos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13116 startpos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13117 startpos, &junk);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13118
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13119 topline = nlines + line;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13120
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13121 /* 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
13122 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
13123 "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
13124 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
13125 if (startpos == BUF_BEGV (b))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13126 {
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
13127 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
13128 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
13129 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13130 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
13131 || linepos == BUF_BEGV (b))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13132 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13133 int limit = BUF_BEGV (b);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13134 int limit_byte = BUF_BEGV_BYTE (b);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13135 int position;
25258
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
13136 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
13137
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13138 if (startpos - distance > limit)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13139 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13140 limit = startpos - distance;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13141 limit_byte = CHAR_TO_BYTE (limit);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13142 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13143
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13144 nlines = display_count_lines (startpos, startpos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13145 limit_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13146 - (height * 2 + 30),
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13147 &position);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13148 /* 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
13149 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
13150 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
13151 if (position == limit_byte && limit == startpos - distance)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13152 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13153 w->base_line_pos = w->buffer;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13154 w->base_line_number = Qnil;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13155 goto no_value;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13156 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13157
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
13158 XSETFASTINT (w->base_line_number, topline - nlines);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13159 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
13160 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13161
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13162 /* 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
13163 nlines = display_count_lines (startpos, startpos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13164 PT_BYTE, PT, &junk);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13165
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13166 /* Record that we did display the line number. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13167 line_number_displayed = 1;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13168
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13169 /* Make the string to show. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13170 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
13171 return decode_mode_spec_buf;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13172 no_value:
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13173 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13174 char* p = decode_mode_spec_buf;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13175 int pad = field_width - 2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13176 while (pad-- > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13177 *p++ = ' ';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13178 *p++ = '?';
29697
f24d81dfa064 * xdisp.c (decode_mode_spec): In "no_value" case, do NUL termination of string.
Ken Raeburn <raeburn@raeburn.org>
parents: 29643
diff changeset
13179 *p++ = '?';
f24d81dfa064 * xdisp.c (decode_mode_spec): In "no_value" case, do NUL termination of string.
Ken Raeburn <raeburn@raeburn.org>
parents: 29643
diff changeset
13180 *p = '\0';
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13181 return decode_mode_spec_buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13182 }
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13183 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13184 break;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13185
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13186 case 'm':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13187 obj = b->mode_name;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13188 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13189
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13190 case 'n':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13191 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
13192 return " Narrow";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13193 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13194
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13195 case 'p':
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13196 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13197 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
13198 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
13199
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13200 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13201 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13202 if (pos <= BUF_BEGV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13203 return "All";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13204 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13205 return "Bottom";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13206 }
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13207 else if (pos <= BUF_BEGV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13208 return "Top";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13209 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13210 {
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
13211 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
13212 /* 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
13213 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
13214 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
13215 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13216 /* We can't normally display a 3-digit number,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13217 so get us a 2-digit number that is close. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13218 if (total == 100)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13219 total = 99;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13220 sprintf (decode_mode_spec_buf, "%2d%%", total);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13221 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13222 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13223 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13224
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13225 /* 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
13226 case 'P':
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13227 {
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13228 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
13229 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
13230 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
13231
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13232 if (botpos >= BUF_ZV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13233 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13234 if (toppos <= BUF_BEGV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13235 return "All";
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13236 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13237 return "Bottom";
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13238 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13239 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13240 {
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
13241 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
13242 /* 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
13243 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
13244 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
13245 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
13246 /* 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
13247 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
13248 if (total == 100)
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13249 total = 99;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13250 if (toppos <= BUF_BEGV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13251 sprintf (decode_mode_spec_buf, "Top%2d%%", total);
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13252 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13253 sprintf (decode_mode_spec_buf, "%2d%%", total);
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13254 return decode_mode_spec_buf;
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13255 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13256 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13257
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13258 case 's':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13259 /* 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
13260 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
13261 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
13262 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
13263 #ifdef subprocesses
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13264 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
13265 #endif
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13266 break;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13267
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13268 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
13269 #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
13270 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
13271 #else
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13272 return "T";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13273 #endif
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13274
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13275 case 'z':
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13276 /* 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
13277 case 'Z':
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13278 /* coding-system (including end-of-line type) */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13279 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13280 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
13281 char *p = decode_mode_spec_buf;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13282
19562
318a3a6a8ff5 (decode_mode_spec): For %Z and %z, put keyboard and
Richard M. Stallman <rms@gnu.org>
parents: 19478
diff changeset
13283 if (! FRAME_WINDOW_P (f))
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13284 {
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
13285 /* 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
13286 to do EOL conversion. */
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
13287 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
13288 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
13289 }
18684
76bdd57b476d (decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents: 18677
diff changeset
13290 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
13291 p, eol_flag);
18684
76bdd57b476d (decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents: 18677
diff changeset
13292
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
13293 #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
13294 #ifdef subprocesses
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13295 obj = Fget_buffer_process (Fcurrent_buffer ());
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13296 if (PROCESSP (obj))
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13297 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13298 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
13299 p, eol_flag);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13300 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
13301 p, eol_flag);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13302 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13303 #endif /* subprocesses */
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
13304 #endif /* 0 */
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13305 *p = 0;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13306 return decode_mode_spec_buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13307 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13308 }
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13309
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
13310 if (STRINGP (obj))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13311 return (char *) XSTRING (obj)->data;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13312 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13313 return "";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13314 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13315
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13316
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13317 /* 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
13318 But don't go beyond LIMIT_BYTE.
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13319 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
13320
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13321 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
13322
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13323 static int
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13324 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
13325 int start, start_byte, limit_byte, count;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13326 int *byte_pos_ptr;
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13327 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13328 register unsigned char *cursor;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13329 unsigned char *base;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13330
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13331 register int ceiling;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13332 register unsigned char *ceiling_addr;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13333 int orig_count = count;
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13334
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13335 /* If we are not in selective display mode,
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13336 check only for newlines. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13337 int selective_display = (!NILP (current_buffer->selective_display)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13338 && !INTEGERP (current_buffer->selective_display));
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13339
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13340 if (count > 0)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13341 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13342 while (start_byte < limit_byte)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13343 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13344 ceiling = BUFFER_CEILING_OF (start_byte);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13345 ceiling = min (limit_byte - 1, ceiling);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13346 ceiling_addr = BYTE_POS_ADDR (ceiling) + 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13347 base = (cursor = BYTE_POS_ADDR (start_byte));
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13348 while (1)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13349 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13350 if (selective_display)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13351 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13352 ;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13353 else
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13354 while (*cursor != '\n' && ++cursor != ceiling_addr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13355 ;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13356
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13357 if (cursor != ceiling_addr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13358 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13359 if (--count == 0)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13360 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13361 start_byte += cursor - base + 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13362 *byte_pos_ptr = start_byte;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13363 return orig_count;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13364 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13365 else
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13366 if (++cursor == ceiling_addr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13367 break;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13368 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13369 else
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13370 break;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13371 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13372 start_byte += cursor - base;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13373 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13374 }
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13375 else
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13376 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13377 while (start_byte > limit_byte)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13378 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13379 ceiling = BUFFER_FLOOR_OF (start_byte - 1);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13380 ceiling = max (limit_byte, ceiling);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13381 ceiling_addr = BYTE_POS_ADDR (ceiling) - 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13382 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
13383 while (1)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13384 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13385 if (selective_display)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13386 while (--cursor != ceiling_addr
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13387 && *cursor != '\n' && *cursor != 015)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13388 ;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13389 else
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13390 while (--cursor != ceiling_addr && *cursor != '\n')
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13391 ;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13392
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13393 if (cursor != ceiling_addr)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13394 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13395 if (++count == 0)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13396 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13397 start_byte += cursor - base + 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13398 *byte_pos_ptr = start_byte;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13399 /* When scanning backwards, we should
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13400 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
13401 return - orig_count - 1;
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13402 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13403 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13404 else
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13405 break;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13406 }
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13407 /* 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
13408 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
13409 start_byte += cursor - base + 1;
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13410 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13411 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13412
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13413 *byte_pos_ptr = limit_byte;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13414
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13415 if (count < 0)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13416 return - orig_count + count;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13417 return orig_count - count;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13418
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13419 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13420
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13421
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13422
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13423 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13424 Displaying strings
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13425 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13426
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13427 /* Display a NUL-terminated string, starting with index START.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13428
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13429 If STRING is non-null, display that C string. Otherwise, the Lisp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13430 string LISP_STRING is displayed.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13431
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13432 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
13433 FACE_STRING. Display STRING or LISP_STRING with the face at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13434 FACE_STRING_POS in FACE_STRING:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13435
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13436 Display the string in the environment given by IT, but use the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13437 standard display table, temporarily.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13438
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13439 FIELD_WIDTH is the minimum number of output glyphs to produce.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13440 If STRING has fewer characters than FIELD_WIDTH, pad to the right
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13441 with spaces. If STRING has more characters, more than FIELD_WIDTH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13442 glyphs will be produced. FIELD_WIDTH <= 0 means don't pad.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13443
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13444 PRECISION is the maximum number of characters to output from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13445 STRING. PRECISION < 0 means don't truncate the string.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13446
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13447 This is roughly equivalent to printf format specifiers:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13448
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13449 FIELD_WIDTH PRECISION PRINTF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13450 ----------------------------------------
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13451 -1 -1 %s
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13452 -1 10 %.10s
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13453 10 -1 %10s
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13454 20 10 %20.10s
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13455
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13456 MULTIBYTE zero means do not display multibyte chars, > 0 means do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13457 display them, and < 0 means obey the current buffer's value of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13458 enable_multibyte_characters.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13459
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13460 Value is the number of glyphs produced. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13461
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13462 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13463 display_string (string, lisp_string, face_string, face_string_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13464 start, it, field_width, precision, max_x, multibyte)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13465 unsigned char *string;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13466 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
13467 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
13468 int face_string_pos;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13469 int start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13470 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13471 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
13472 int multibyte;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13473 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13474 int hpos_at_start = it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13475 int saved_face_id = it->face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13476 struct glyph_row *row = it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13477
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13478 /* Initialize the iterator IT for iteration over STRING beginning
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13479 with index START. We assume that IT may be modified here (which
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13480 means that display_line has to do something when displaying a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13481 mini-buffer prompt, which it does). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13482 reseat_to_string (it, string, lisp_string, start,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13483 precision, field_width, multibyte);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13484
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13485 /* If displaying STRING, set up the face of the iterator
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13486 from LISP_STRING, if that's given. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13487 if (STRINGP (face_string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13488 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13489 int endptr;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13490 struct face *face;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13491
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13492 it->face_id
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13493 = face_at_string_position (it->w, face_string, face_string_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13494 0, it->region_beg_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13495 it->region_end_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13496 &endptr, it->base_face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13497 face = FACE_FROM_ID (it->f, it->face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13498 it->face_box_p = face->box != FACE_NO_BOX;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13499 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13500
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13501 /* 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
13502 beyond the right edge of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13503 if (max_x <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13504 max_x = it->last_visible_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13505 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13506 max_x = min (max_x, it->last_visible_x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13507
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13508 /* Skip over display elements that are not visible. because IT->w is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13509 hscrolled. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13510 if (it->current_x < it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13511 move_it_in_display_line_to (it, 100000, it->first_visible_x,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13512 MOVE_TO_POS | MOVE_TO_X);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13513
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13514 row->ascent = it->max_ascent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13515 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
13516 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
13517 row->phys_height = it->max_phys_ascent + it->max_phys_descent;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13518
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13519 /* 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
13520 past last_visible_x. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13521 while (it->current_x < max_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13522 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13523 int x_before, x, n_glyphs_before, i, nglyphs;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13524
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13525 /* Get the next display element. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13526 if (!get_next_display_element (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13527 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13528
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13529 /* Produce glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13530 x_before = it->current_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13531 n_glyphs_before = it->glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13532 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13533
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13534 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13535 i = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13536 x = x_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13537 while (i < nglyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13538 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13539 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13540
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13541 if (!it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13542 && x + glyph->pixel_width > max_x)
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
13543 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13544 /* End of continued line or max_x reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13545 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13546 it->current_x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13547 break;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13548 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13549 else if (x + glyph->pixel_width > it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13550 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13551 /* Glyph is at least partially visible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13552 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13553 if (x < it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13554 it->glyph_row->x = x - it->first_visible_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13555 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13556 else
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13557 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13558 /* Glyph is off the left margin of the display area.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13559 Should not happen. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13560 abort ();
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13561 }
23647
d87960db41e9 (display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents: 23417
diff changeset
13562
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13563 row->ascent = max (row->ascent, it->max_ascent);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13564 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
13565 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
13566 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
13567 it->max_phys_ascent + it->max_phys_descent);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13568 x += glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13569 ++i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13570 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13571
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13572 /* Stop if max_x reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13573 if (i < nglyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13574 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13575
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13576 /* Stop at line ends. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13577 if (ITERATOR_AT_END_OF_LINE_P (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13578 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13579 it->continuation_lines_width = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13580 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13581 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13582
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
13583 set_iterator_to_next (it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13584
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13585 /* Stop if truncating at the right edge. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13586 if (it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13587 && it->current_x >= it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13588 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13589 /* Add truncation mark, but don't do it if the line is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13590 truncated at a padding space. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13591 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
13592 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13593 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13594 produce_special_glyphs (it, IT_TRUNCATION);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13595 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
13596 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13597 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13598 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13599 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13600
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13601 /* Maybe insert a truncation at the left. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13602 if (it->first_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13603 && IT_CHARPOS (*it) > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13604 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13605 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13606 insert_left_trunc_glyphs (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13607 it->glyph_row->truncated_on_left_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13608 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13609
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13610 it->face_id = saved_face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13611
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13612 /* Value is number of columns displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13613 return it->hpos - hpos_at_start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13614 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13615
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13616
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13617
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13618 /* 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
13619 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
13620 If PROPVAL is a list, compare each element against LIST in that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13621 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
13622 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
13623
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13624 int
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13625 invisible_p (propval, list)
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13626 register Lisp_Object propval;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13627 Lisp_Object list;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13628 {
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
13629 register Lisp_Object tail, proptail;
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13630
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13631 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
13632 {
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13633 register Lisp_Object tem;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13634 tem = XCAR (tail);
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13635 if (EQ (propval, tem))
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13636 return 1;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13637 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
13638 return 1;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13639 }
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13640
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
13641 if (CONSP (propval))
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13642 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13643 for (proptail = propval; CONSP (proptail); proptail = XCDR (proptail))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13644 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13645 Lisp_Object propelt;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13646 propelt = XCAR (proptail);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13647 for (tail = list; CONSP (tail); tail = XCDR (tail))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13648 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13649 register Lisp_Object tem;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13650 tem = XCAR (tail);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13651 if (EQ (propelt, tem))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13652 return 1;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13653 if (CONSP (tem) && EQ (propelt, XCAR (tem)))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13654 return 1;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13655 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13656 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13657 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13658
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13659 return 0;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13660 }
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13661
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13662
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13663 /* 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
13664 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
13665 each element of PROPVAL in that way, and the first time some
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13666 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
13667 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
13668
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13669 int
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13670 invisible_ellipsis_p (propval, list)
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13671 register Lisp_Object propval;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13672 Lisp_Object list;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13673 {
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
13674 register Lisp_Object tail, proptail;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13675
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13676 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
13677 {
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13678 register Lisp_Object tem;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13679 tem = XCAR (tail);
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13680 if (CONSP (tem) && EQ (propval, XCAR (tem)))
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13681 return ! NILP (XCDR (tem));
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13682 }
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13683
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
13684 if (CONSP (propval))
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13685 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
13686 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
13687 Lisp_Object propelt;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13688 propelt = XCAR (proptail);
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13689 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
13690 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
13691 register Lisp_Object tem;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13692 tem = XCAR (tail);
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13693 if (CONSP (tem) && EQ (propelt, XCAR (tem)))
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13694 return ! NILP (XCDR (tem));
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
13695 }
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
13696 }
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13697
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13698 return 0;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13699 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13700
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13701
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13702
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13703 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13704 Initialization
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13705 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13706
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13707 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13708 syms_of_xdisp ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13709 {
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
13710 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
13711 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
13712
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
13713 Vmessage_stack = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
13714 staticpro (&Vmessage_stack);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
13715
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
13716 Qinhibit_redisplay = intern ("inhibit-redisplay");
22543
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
13717 staticpro (&Qinhibit_redisplay);
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
13718
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13719 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13720 defsubr (&Sdump_glyph_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13721 defsubr (&Sdump_glyph_row);
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
13722 defsubr (&Sdump_tool_bar_row);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13723 defsubr (&Strace_redisplay_toggle);
27540
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
13724 defsubr (&Strace_to_stderr);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13725 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13726
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
13727 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
13728 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
13729
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
13730 staticpro (&Qoverriding_terminal_local_map);
12267
e3421dcda014 Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents: 12263
diff changeset
13731 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
13732
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
13733 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
13734 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
13735
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
13736 staticpro (&Qwindow_scroll_functions);
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
13737 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
13738
13584
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
13739 staticpro (&Qredisplay_end_trigger_functions);
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
13740 Qredisplay_end_trigger_functions = intern ("redisplay-end-trigger-functions");
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13741
21748
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
13742 staticpro (&Qinhibit_point_motion_hooks);
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
13743 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
13744
28002
694ac11a3e1c (QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 27990
diff changeset
13745 QCdata = intern (":data");
694ac11a3e1c (QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 27990
diff changeset
13746 staticpro (&QCdata);
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
13747 Qdisplay = intern ("display");
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13748 staticpro (&Qdisplay);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13749 Qspace_width = intern ("space-width");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13750 staticpro (&Qspace_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13751 Qraise = intern ("raise");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13752 staticpro (&Qraise);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13753 Qspace = intern ("space");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13754 staticpro (&Qspace);
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
13755 Qmargin = intern ("margin");
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
13756 staticpro (&Qmargin);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13757 Qleft_margin = intern ("left-margin");
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
13758 staticpro (&Qleft_margin);
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
13759 Qright_margin = intern ("right-margin");
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13760 staticpro (&Qright_margin);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13761 Qalign_to = intern ("align-to");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13762 staticpro (&Qalign_to);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13763 QCalign_to = intern (":align-to");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13764 staticpro (&QCalign_to);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13765 Qrelative_width = intern ("relative-width");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13766 staticpro (&Qrelative_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13767 QCrelative_width = intern (":relative-width");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13768 staticpro (&QCrelative_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13769 QCrelative_height = intern (":relative-height");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13770 staticpro (&QCrelative_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13771 QCeval = intern (":eval");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13772 staticpro (&QCeval);
25614
766b6a577f15 (Qwhen): Replaces QCwhen.
Gerd Moellmann <gerd@gnu.org>
parents: 25598
diff changeset
13773 Qwhen = intern ("when");
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
13774 staticpro (&Qwhen);
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
13775 QCfile = intern (":file");
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
13776 staticpro (&QCfile);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13777 Qfontified = intern ("fontified");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13778 staticpro (&Qfontified);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13779 Qfontification_functions = intern ("fontification-functions");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13780 staticpro (&Qfontification_functions);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13781 Qtrailing_whitespace = intern ("trailing-whitespace");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13782 staticpro (&Qtrailing_whitespace);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13783 Qimage = intern ("image");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13784 staticpro (&Qimage);
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
13785 Qmessage_truncate_lines = intern ("message-truncate-lines");
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
13786 staticpro (&Qmessage_truncate_lines);
33314
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
13787 Qgrow_only = intern ("grow-only");
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
13788 staticpro (&Qgrow_only);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13789
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
13790 last_arrow_position = Qnil;
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
13791 last_arrow_string = Qnil;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13792 staticpro (&last_arrow_position);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13793 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
13794
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
13795 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
13796 staticpro (&echo_buffer[0]);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
13797 staticpro (&echo_buffer[1]);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
13798
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
13799 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
13800 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
13801 staticpro (&echo_area_buffer[1]);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13802
30728
a87e28789082 (Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30721
diff changeset
13803 Vmessages_buffer_name = build_string ("*Messages*");
a87e28789082 (Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30721
diff changeset
13804 staticpro (&Vmessages_buffer_name);
a87e28789082 (Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30721
diff changeset
13805
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
13806 DEFVAR_LISP ("show-trailing-whitespace", &Vshow_trailing_whitespace,
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
13807 "Non-nil means highlight trailing whitespace.\n\
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
13808 The face used for trailing whitespace is `trailing-whitespace'.");
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
13809 Vshow_trailing_whitespace = Qnil;
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
13810
22543
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
13811 DEFVAR_LISP ("inhibit-redisplay", &Vinhibit_redisplay,
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
13812 "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
13813 This is used for internal purposes.");
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
13814 Vinhibit_redisplay = Qnil;
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
13815
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13816 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string,
782
a6d00bdb2b60 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 781
diff changeset
13817 "String (or mode line construct) included (normally) in `mode-line-format'.");
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13818 Vglobal_mode_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13819
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13820 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13821 "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
13822 This must be the beginning of a line in order to work.\n\
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13823 See also `overlay-arrow-string'.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13824 Voverlay_arrow_position = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13825
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13826 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13827 "String to display as an arrow. See also `overlay-arrow-position'.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13828 Voverlay_arrow_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13829
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13830 DEFVAR_INT ("scroll-step", &scroll_step,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13831 "*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
13832 If that fails to bring point back on frame, point is centered instead.\n\
33490
b714a06b99ec (try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33462
diff changeset
13833 If this is zero, point is always centered after it moves off frame.\n\
b714a06b99ec (try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33462
diff changeset
13834 If you want scrolling to always be a line at a time, you should set\n\
b714a06b99ec (try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33462
diff changeset
13835 `scroll-conservatively' to a large value rather than set this to 1.");
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13836
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
13837 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively,
27681
2e811e86c10b (syms_of_xdisp): Doc fix for scroll-conservatively.
Gerd Moellmann <gerd@gnu.org>
parents: 27634
diff changeset
13838 "*Scroll up to this many lines, to bring point back on screen.\n\
2e811e86c10b (syms_of_xdisp): Doc fix for scroll-conservatively.
Gerd Moellmann <gerd@gnu.org>
parents: 27634
diff changeset
13839 A value of zero means to scroll the text to center point vertically\n\
2e811e86c10b (syms_of_xdisp): Doc fix for scroll-conservatively.
Gerd Moellmann <gerd@gnu.org>
parents: 27634
diff changeset
13840 in the window.");
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
13841 scroll_conservatively = 0;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
13842
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
13843 DEFVAR_INT ("scroll-margin", &scroll_margin,
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
13844 "*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
13845 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
13846 of the top or bottom of the window.");
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
13847 scroll_margin = 0;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
13848
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13849 #if GLYPH_DEBUG
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13850 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask");
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13851 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13852
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13853 DEFVAR_BOOL ("truncate-partial-width-windows",
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13854 &truncate_partial_width_windows,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
13855 "*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
13856 truncate_partial_width_windows = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13857
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13858 DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video,
33840
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
13859 "nil means display the mode-line/header-line/menu-bar in the default face.\n\
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
13860 Any other value means to use the appropriate face, `mode-line',\n\
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
13861 `header-line', or `menu' respectively.\n\
33721
c45f067779c1 (syms_of_xdisp): `mode-line-inverse-video' defualts to nil.
Miles Bader <miles@gnu.org>
parents: 33600
diff changeset
13862 \n\
33840
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
13863 This variable is deprecated; please change the above faces instead.");
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
13864 mode_line_inverse_video = 1;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13865
29632
96d83d5a48b3 (Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 29515
diff changeset
13866 DEFVAR_LISP ("line-number-display-limit", &Vline_number_display_limit,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13867 "*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
13868 If the buffer is bigger than this, the line number does not appear\n\
29632
96d83d5a48b3 (Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 29515
diff changeset
13869 in the mode line. A value of nil means no limit.");
96d83d5a48b3 (Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 29515
diff changeset
13870 Vline_number_display_limit = Qnil;
96d83d5a48b3 (Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 29515
diff changeset
13871
96d83d5a48b3 (Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 29515
diff changeset
13872 DEFVAR_INT ("line-number-display-limit-width",
96d83d5a48b3 (Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 29515
diff changeset
13873 &line_number_display_limit_width,
25258
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
13874 "*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
13875 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
13876 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
13877 line_number_display_limit_width = 200;
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
13878
3265
80f57ae8d44e (syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 3165
diff changeset
13879 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
13880 "*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
13881 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
13882
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13883 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
13884 "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
13885 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
13886 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
13887 `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
13888
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13889 DEFVAR_LISP ("frame-title-format", &Vframe_title_format,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13890 "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
13891 \(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
13892 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
13893 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
13894 \(see `modify-frame-parameters').");
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13895 DEFVAR_LISP ("icon-title-format", &Vicon_title_format,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13896 "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
13897 \(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
13898 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
13899 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
13900 \(see `modify-frame-parameters').");
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13901 Vicon_title_format
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13902 = Vframe_title_format
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13903 = Fcons (intern ("multiple-frames"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13904 Fcons (build_string ("%b"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13905 Fcons (Fcons (build_string (""),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13906 Fcons (intern ("invocation-name"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13907 Fcons (build_string ("@"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13908 Fcons (intern ("system-name"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13909 Qnil)))),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13910 Qnil)));
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
13911
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
13912 DEFVAR_LISP ("message-log-max", &Vmessage_log_max,
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
13913 "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
13914 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
13915 the buffer when it becomes large.");
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
13916 XSETFASTINT (Vmessage_log_max, 50);
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
13917
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
13918 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
13919 "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
13920 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
13921 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
13922 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
13923 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
13924 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
13925
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
13926 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13927 "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
13928 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
13929 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
13930 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
13931 Vwindow_scroll_functions = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13932
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
13933 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
13934 "*Non-nil means automatically resize tool-bars.\n\
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
13935 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
13936 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
13937 otherwise.");
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
13938 auto_resize_tool_bars_p = 1;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
13939
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
13940 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
13941 "*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
13942 auto_raise_tool_bar_buttons_p = 1;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
13943
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
13944 DEFVAR_INT ("tool-bar-button-margin", &tool_bar_button_margin,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
13945 "*Margin around tool-bar buttons in pixels.");
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
13946 tool_bar_button_margin = 1;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
13947
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
13948 DEFVAR_INT ("tool-bar-button-relief", &tool_bar_button_relief,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
13949 "Relief thickness of tool-bar buttons.");
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
13950 tool_bar_button_relief = 3;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13951
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13952 DEFVAR_LISP ("fontification-functions", &Vfontification_functions,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13953 "List of functions to call to fontify regions of text.\n\
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13954 Each function is called with one argument POS. Functions must\n\
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13955 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
13956 fontified regions the property `fontified'.\n\
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13957 This variable automatically becomes buffer-local when set.");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13958 Vfontification_functions = Qnil;
33824
09db0c6cb714 (syms_of_xdisp): Make fontification-functions buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33762
diff changeset
13959 Fmake_variable_buffer_local (Qfontification_functions);
24676
ba5632c9721a (display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents: 24557
diff changeset
13960
ba5632c9721a (display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents: 24557
diff changeset
13961 DEFVAR_BOOL ("unibyte-display-via-language-environment",
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13962 &unibyte_display_via_language_environment,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13963 "*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
13964 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
13965 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
13966 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
13967 displayed according to the current fontset.");
ba5632c9721a (display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents: 24557
diff changeset
13968 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
13969
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
13970 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
13971 "*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
13972 If a float, it specifies a fraction of the mini-window frame's height.\n\
33314
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
13973 If an integer, it specifies 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
13974 Vmax_mini_window_height = make_float (0.25);
33314
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
13975
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
13976 DEFVAR_LISP ("resize-mini-windows", &Vresize_mini_windows,
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
13977 "*How to resize the mini-window.\n\
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
13978 A value of nil means don't automatically resize mini-windows.\n\
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
13979 A value of t means resize it to fit the text displayed in it.\n\
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
13980 A value of `grow-only', the default, means let mini-windows grow\n\
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
13981 only, until the its display becomes empty, at which point the mini-window\n\
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
13982 goes back to its normal size.");
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
13983 Vresize_mini_windows = Qgrow_only;
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
13984
27843
d401b5066063 (cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27721
diff changeset
13985 DEFVAR_BOOL ("cursor-in-non-selected-windows",
d401b5066063 (cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27721
diff changeset
13986 &cursor_in_non_selected_windows,
d401b5066063 (cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27721
diff changeset
13987 "*Non-nil means display a hollow cursor in non-selected windows.\n\
d401b5066063 (cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27721
diff changeset
13988 Nil means don't display a cursor there.");
d401b5066063 (cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27721
diff changeset
13989 cursor_in_non_selected_windows = 1;
28692
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
13990
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
13991 DEFVAR_BOOL ("automatic-hscrolling", &automatic_hscrolling_p,
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
13992 "*Non-nil means scroll the display automatically to make point visible.");
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
13993 automatic_hscrolling_p = 1;
28984
540ca0531c77 (Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 28932
diff changeset
13994
540ca0531c77 (Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 28932
diff changeset
13995 DEFVAR_LISP ("image-types", &Vimage_types,
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
13996 "List of supported image types.\n\
28984
540ca0531c77 (Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 28932
diff changeset
13997 Each element of the list is a symbol for a supported image type.");
540ca0531c77 (Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 28932
diff changeset
13998 Vimage_types = Qnil;
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
13999
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
14000 DEFVAR_BOOL ("message-truncate-lines", &message_truncate_lines,
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
14001 "If non-nil, messages are truncated instead of resizing the echo area.\n\
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
14002 Bind this around calls to `message' to let it take effect.");
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
14003 message_truncate_lines = 0;
31845
4bdcc0f0232f (syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents: 31826
diff changeset
14004
4bdcc0f0232f (syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents: 31826
diff changeset
14005 DEFVAR_LISP ("menu-bar-update-hook", &Vmenu_bar_update_hook,
4bdcc0f0232f (syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents: 31826
diff changeset
14006 "Normal hook run for clicks on menu bar, before displaying a submenu.\n\
4bdcc0f0232f (syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents: 31826
diff changeset
14007 Can be used to update submenus whose contents should vary.");
33314
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
14008 Vmenu_bar_update_hook = Qnil;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14009 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14010
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14011
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14012 /* Initialize this module when Emacs starts. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14013
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21478
diff changeset
14014 void
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14015 init_xdisp ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14016 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14017 Lisp_Object root_window;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14018 struct window *mini_w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14019
33462
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
14020 current_header_line_height = current_mode_line_height = -1;
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
14021
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14022 CHARPOS (this_line_start_pos) = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14023
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14024 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
14025 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14026
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14027 if (!noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14028 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14029 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (root_window)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14030 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14031
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14032 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
14033 set_window_height (root_window,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14034 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
14035 0);
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
14036 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14037 set_window_height (minibuf_window, 1, 0);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14038
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
14039 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
14040 XSETFASTINT (mini_w->width, FRAME_WIDTH (f));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14041
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14042 scratch_glyph_row.glyphs[TEXT_AREA] = scratch_glyphs;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14043 scratch_glyph_row.glyphs[TEXT_AREA + 1]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14044 = scratch_glyphs + MAX_SCRATCH_GLYPHS;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14045
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14046 /* The default ellipsis glyphs `...'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14047 for (i = 0; i < 3; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14048 XSETFASTINT (default_invis_vector[i], '.');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14049 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14050
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14051 #ifdef HAVE_WINDOW_SYSTEM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14052 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14053 /* Allocate the buffer for frame titles. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14054 int size = 100;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14055 frame_title_buf = (char *) xmalloc (size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14056 frame_title_buf_end = frame_title_buf + size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14057 frame_title_ptr = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14058 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14059 #endif /* HAVE_WINDOW_SYSTEM */
31876
de16d989722a (help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31849
diff changeset
14060
de16d989722a (help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31849
diff changeset
14061 help_echo_showing_p = 0;
de16d989722a (help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31849
diff changeset
14062 }
de16d989722a (help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31849
diff changeset
14063
de16d989722a (help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31849
diff changeset
14064