annotate src/xdisp.c @ 35636:4eb554667665

(dabbrev--substitute-expansion): Treat a one-capital-letter abbrev as "not all upper case", so as to force preservation of the expansion's pattern if the expansion starts with a capital letter.
author Gerd Moellmann <gerd@gnu.org>
date Sat, 27 Jan 2001 12:05:36 +0000
parents c332de00af36
children 369c647a5ed5
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.
35174
96c7c0a356aa (push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35029
diff changeset
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 97, 98, 99, 2000, 2001
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
35277
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
242 Lisp_Object Vtool_bar_button_margin;
25543
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 *));
34288
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
762 static int underlying_face_id P_ ((struct it *));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
763
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
764 #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
765 #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
766
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
767 #ifdef HAVE_WINDOW_SYSTEM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
768
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
769 static void update_tool_bar P_ ((struct frame *, int));
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
770 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
771 static int redisplay_tool_bar P_ ((struct frame *));
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
772 static void display_tool_bar_line P_ ((struct it *));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
773
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
774 #endif /* HAVE_WINDOW_SYSTEM */
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 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
778 Window display dimensions
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
781 /* Return the window-relative maximum y + 1 for glyph rows displaying
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
782 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
783 mode line, if any. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
784
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
785 INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
786 window_text_bottom_y (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
787 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
788 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
789 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
790 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
791
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
792 if (WINDOW_WANTS_MODELINE_P (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
793 height -= CURRENT_MODE_LINE_HEIGHT (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
794 return height;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
798 /* 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
799 means return the total width of W, not including bitmap areas to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
800 the left and right of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
801
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
802 INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
803 window_box_width (w, area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
804 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
805 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
806 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
807 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
808 int width = XFASTINT (w->width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
809
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
810 if (!w->pseudo_window_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
811 {
25463
255017b70168 (window_box_width): Use FRAME_FLAGS_AREA_COLS instead of
Gerd Moellmann <gerd@gnu.org>
parents: 25403
diff changeset
812 width -= FRAME_SCROLL_BAR_WIDTH (f) + FRAME_FLAGS_AREA_COLS (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
813
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
814 if (area == TEXT_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
815 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
816 if (INTEGERP (w->left_margin_width))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
817 width -= XFASTINT (w->left_margin_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
818 if (INTEGERP (w->right_margin_width))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
819 width -= XFASTINT (w->right_margin_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
820 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
821 else if (area == LEFT_MARGIN_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
822 width = (INTEGERP (w->left_margin_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
823 ? XFASTINT (w->left_margin_width) : 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
824 else if (area == RIGHT_MARGIN_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
825 width = (INTEGERP (w->right_margin_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
826 ? XFASTINT (w->right_margin_width) : 0);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
829 return width * CANON_X_UNIT (f);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
833 /* Return the pixel height of the display area of window W, not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
834 including mode lines of W, if any.. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
835
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
836 INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
837 window_box_height (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
838 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
839 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
840 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
841 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
842
85c245edb7d7 (window_box_height): Add an assertion.
Gerd Moellmann <gerd@gnu.org>
parents: 31876
diff changeset
843 xassert (height >= 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
844
34582
4099c0fd33f4 (window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents: 34578
diff changeset
845 /* Note: the code below that determines the mode-line/header-line
4099c0fd33f4 (window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents: 34578
diff changeset
846 height is essentially the same as that contained in the macro
4099c0fd33f4 (window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents: 34578
diff changeset
847 CURRENT_{MODE,HEADER}_LINE_HEIGHT, except that it checks whether
4099c0fd33f4 (window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents: 34578
diff changeset
848 the appropriate glyph row has its `mode_line_p' flag set,
4099c0fd33f4 (window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents: 34578
diff changeset
849 and if it doesn't, uses estimate_mode_line_height instead. */
4099c0fd33f4 (window_box_height): Add comment.
Miles Bader <miles@gnu.org>
parents: 34578
diff changeset
850
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
851 if (WINDOW_WANTS_MODELINE_P (w))
34578
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
852 {
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
853 struct glyph_row *ml_row
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
854 = (w->current_matrix && w->current_matrix->rows
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
855 ? MATRIX_MODE_LINE_ROW (w->current_matrix)
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
856 : 0);
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
857 if (ml_row && ml_row->mode_line_p)
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
858 height -= ml_row->height;
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
859 else
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
860 height -= estimate_mode_line_height (f, MODE_LINE_FACE_ID);
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
861 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
862
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
863 if (WINDOW_WANTS_HEADER_LINE_P (w))
34578
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
864 {
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
865 struct glyph_row *hl_row
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
866 = (w->current_matrix && w->current_matrix->rows
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
867 ? MATRIX_HEADER_LINE_ROW (w->current_matrix)
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
868 : 0);
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
869 if (hl_row && hl_row->mode_line_p)
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
870 height -= hl_row->height;
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
871 else
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
872 height -= estimate_mode_line_height (f, HEADER_LINE_FACE_ID);
cd90170bc811 (window_box_height): Only use mode-line glyph-rows that are actually
Miles Bader <miles@gnu.org>
parents: 34500
diff changeset
873 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
874
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
875 return height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
876 }
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 the frame-relative coordinate of the left edge of display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
880 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
881 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
882 W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
883
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
884 INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
885 window_box_left (w, area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
886 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
887 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
888 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
889 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
890 int x = FRAME_INTERNAL_BORDER_WIDTH_SAFE (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
891
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
892 if (!w->pseudo_window_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
893 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
894 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
895 + FRAME_LEFT_FLAGS_AREA_WIDTH (f));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
896
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
897 if (area == TEXT_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
898 x += window_box_width (w, LEFT_MARGIN_AREA);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
899 else if (area == RIGHT_MARGIN_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
900 x += (window_box_width (w, LEFT_MARGIN_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
901 + window_box_width (w, TEXT_AREA));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
902 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
903
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
904 return x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
905 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
906
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
907
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
908 /* Return the frame-relative coordinate of the right edge of display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
909 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
910 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
911 W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
912
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
913 INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
914 window_box_right (w, area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
915 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
916 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
917 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
918 return window_box_left (w, area) + window_box_width (w, area);
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, in frame-relative coordinates. AREA < 0 means the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
924 whole window, not including bitmap areas to the left and right of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
925 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
926 coordinates of the upper-left corner of the box. Return in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
927 *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
928
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
929 INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
930 window_box (w, area, box_x, box_y, box_width, box_height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
931 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
932 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
933 int *box_x, *box_y, *box_width, *box_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
934 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
935 struct frame *f = XFRAME (w->frame);
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 *box_width = window_box_width (w, area);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
938 *box_height = window_box_height (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
939 *box_x = window_box_left (w, area);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
940 *box_y = (FRAME_INTERNAL_BORDER_WIDTH_SAFE (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
941 + XFASTINT (w->top) * CANON_Y_UNIT (f));
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
942 if (WINDOW_WANTS_HEADER_LINE_P (w))
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
943 *box_y += CURRENT_HEADER_LINE_HEIGHT (w);
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
947 /* 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
948 mode lines. AREA < 0 means the whole window, not including bitmap
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
949 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
950 and TOP_LEFT_Y the frame-relative pixel coordinates of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
951 upper-left corner of the box. Return in *BOTTOM_RIGHT_X, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
952 *BOTTOM_RIGHT_Y the coordinates of the bottom-right corner of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
953 box. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
954
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
955 INLINE void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
956 window_box_edges (w, area, top_left_x, top_left_y,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
957 bottom_right_x, bottom_right_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
958 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
959 int area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
960 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
961 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
962 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
963 bottom_right_y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
964 *bottom_right_x += *top_left_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
965 *bottom_right_y += *top_left_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
966 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
967
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
968
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
969
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
970 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
971 Utilities
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
972 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
973
33510
405f162f1fc7 (pos_visible_p): Improve function comment.
Gerd Moellmann <gerd@gnu.org>
parents: 33490
diff changeset
974 /* 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
975 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
976 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
977 and header-lines heights. */
32873
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
978
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
979 int
33462
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
980 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
981 struct window *w;
33462
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
982 int charpos, *fully, exact_mode_line_heights_p;
32873
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
983 {
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
984 struct it it;
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
985 struct text_pos top;
32912
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
986 int visible_p;
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
987 struct buffer *old_buffer = NULL;
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
988
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
989 if (XBUFFER (w->buffer) != current_buffer)
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
990 {
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
991 old_buffer = current_buffer;
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
992 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
993 }
32873
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
994
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
995 *fully = visible_p = 0;
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
996 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
997
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
998 /* 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
999 if (exact_mode_line_heights_p)
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
1000 {
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
1001 if (WINDOW_WANTS_MODELINE_P (w))
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
1002 current_mode_line_height
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
1003 = 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
1004 current_buffer->mode_line_format);
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
1005
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
1006 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
1007 current_header_line_height
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
1008 = 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
1009 current_buffer->header_line_format);
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
1010 }
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
1011
32873
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1012 start_display (&it, w, top);
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1013 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
1014 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y);
34947
5854869b9445 (pos_visible_p): Take into account that CHARPOS maybe
Gerd Moellmann <gerd@gnu.org>
parents: 34927
diff changeset
1015
5854869b9445 (pos_visible_p): Take into account that CHARPOS maybe
Gerd Moellmann <gerd@gnu.org>
parents: 34927
diff changeset
1016 /* Note that we may overshoot because of invisible text. */
5854869b9445 (pos_visible_p): Take into account that CHARPOS maybe
Gerd Moellmann <gerd@gnu.org>
parents: 34927
diff changeset
1017 if (IT_CHARPOS (it) >= charpos)
32873
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1018 {
32912
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1019 int line_height, line_bottom_y;
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1020 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
1021 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
1022
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1023 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
1024 if (line_height == 0)
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1025 {
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1026 if (last_height)
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1027 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
1028 else if (charpos < ZV)
32912
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1029 {
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1030 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
1031 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
1032 ? it.max_ascent + it.max_descent
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1033 : last_height);
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1034 }
33568
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1035 else
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1036 {
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1037 /* Use the default character height. */
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1038 it.what = IT_CHARACTER;
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1039 it.c = ' ';
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1040 it.len = 1;
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1041 PRODUCE_GLYPHS (&it);
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1042 line_height = it.ascent + it.descent;
ea6ead04f574 (pos_visible_p): Compute the default character height
Gerd Moellmann <gerd@gnu.org>
parents: 33531
diff changeset
1043 }
32912
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1044 }
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1045 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
1046
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1047 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
1048 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
1049 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
1050 {
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1051 visible_p = 1;
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1052 *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
1053 }
32873
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1054 }
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1055 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
1056 {
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1057 move_it_by_lines (&it, 1, 0);
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1058 if (charpos < IT_CHARPOS (it))
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1059 {
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1060 visible_p = 1;
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1061 *fully = 0;
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1062 }
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1063 }
32912
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1064
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1065 if (old_buffer)
b55f99786a33 (pos_visible_p): Change current buffer if necessary.
Gerd Moellmann <gerd@gnu.org>
parents: 32878
diff changeset
1066 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
1067
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
1068 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
1069 return visible_p;
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1070 }
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1071
1dbdec58e580 (pos_visible_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32752
diff changeset
1072
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1073 /* 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
1074 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
1075 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
1076 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
1077 character. */
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1078
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1079 static INLINE int
25098
188fc8b67ea9 (string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents: 25096
diff changeset
1080 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
1081 unsigned char *str;
25098
188fc8b67ea9 (string_char_and_length): Fix previous change.
Gerd Moellmann <gerd@gnu.org>
parents: 25096
diff changeset
1082 int maxlen, *len;
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1083 {
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1084 int c;
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1085
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1086 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
1087 if (!CHAR_VALID_P (c, 1))
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1088 /* 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
1089 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
1090 characters. */
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1091 c = '?';
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1092
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1093 return c;
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1094 }
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1095
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1097
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1098 /* Given a position POS containing a valid character and byte position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1099 in STRING, return the position NCHARS ahead (NCHARS >= 0). */
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 static struct text_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1102 string_pos_nchars_ahead (pos, string, nchars)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1103 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1104 Lisp_Object string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1105 int nchars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1106 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1107 xassert (STRINGP (string) && nchars >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1108
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1109 if (STRING_MULTIBYTE (string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1110 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1111 int rest = STRING_BYTES (XSTRING (string)) - BYTEPOS (pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1112 unsigned char *p = XSTRING (string)->data + BYTEPOS (pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1113 int len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1114
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1115 while (nchars--)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1116 {
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1117 string_char_and_length (p, rest, &len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1118 p += len, rest -= len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1119 xassert (rest >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1120 CHARPOS (pos) += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1121 BYTEPOS (pos) += len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1122 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1123 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1124 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1125 SET_TEXT_POS (pos, CHARPOS (pos) + nchars, BYTEPOS (pos) + nchars);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1126
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1127 return pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1128 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1129
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 /* Value is the text position, i.e. character and byte position,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1132 for character position CHARPOS in STRING. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1133
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1134 static INLINE struct text_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1135 string_pos (charpos, string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1136 int charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1137 Lisp_Object string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1138 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1139 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1140 xassert (STRINGP (string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1141 xassert (charpos >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1142 SET_TEXT_POS (pos, charpos, string_char_to_byte (string, charpos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1143 return pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1144 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1145
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1146
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1147 /* Value is a text position, i.e. character and byte position, for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1148 character position CHARPOS in C string S. MULTIBYTE_P non-zero
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1149 means recognize multibyte characters. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1150
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1151 static struct text_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1152 c_string_pos (charpos, s, multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1153 int charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1154 unsigned char *s;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1155 int multibyte_p;
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 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1158
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1159 xassert (s != NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1160 xassert (charpos >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1161
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1162 if (multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1163 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1164 int rest = strlen (s), len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1165
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1166 SET_TEXT_POS (pos, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1167 while (charpos--)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1168 {
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1169 string_char_and_length (s, rest, &len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1170 s += len, rest -= len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1171 xassert (rest >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1172 CHARPOS (pos) += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1173 BYTEPOS (pos) += len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1174 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1175 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1176 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1177 SET_TEXT_POS (pos, charpos, charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1178
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1179 return pos;
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
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 /* Value is the number of characters in C string S. MULTIBYTE_P
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1184 non-zero means recognize multibyte characters. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1185
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1186 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1187 number_of_chars (s, multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1188 unsigned char *s;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1189 int multibyte_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1190 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1191 int nchars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1192
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1193 if (multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1194 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1195 int rest = strlen (s), len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1196 unsigned char *p = (unsigned char *) s;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1197
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1198 for (nchars = 0; rest > 0; ++nchars)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1199 {
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
1200 string_char_and_length (p, rest, &len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1201 rest -= len, p += len;
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1205 nchars = strlen (s);
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 return nchars;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1210
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1211 /* Compute byte position NEWPOS->bytepos corresponding to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1212 NEWPOS->charpos. POS is a known position in string STRING.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1213 NEWPOS->charpos must be >= POS.charpos. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1214
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1215 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1216 compute_string_pos (newpos, pos, string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1217 struct text_pos *newpos, pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1218 Lisp_Object string;
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 xassert (STRINGP (string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1221 xassert (CHARPOS (*newpos) >= CHARPOS (pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1222
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1223 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
1224 *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
1225 CHARPOS (*newpos) - CHARPOS (pos));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1226 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1227 BYTEPOS (*newpos) = CHARPOS (*newpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1228 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1229
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1230
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1231
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1232 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1233 Lisp form evaluation
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1234 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1235
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1236 /* Error handler for safe_eval and safe_call. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1237
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1238 static Lisp_Object
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1239 safe_eval_handler (arg)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1240 Lisp_Object arg;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1241 {
33072
176f2eb7a645 (safe_eval_handler): Call add_to_log.
Gerd Moellmann <gerd@gnu.org>
parents: 33068
diff changeset
1242 add_to_log ("Error during redisplay: %s", arg, Qnil);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1243 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1244 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1245
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1246
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1247 /* Evaluate SEXPR and return the result, or nil if something went
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1248 wrong. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1249
30202
bade676e0950 (eval_form): Make it externally visible.
Gerd Moellmann <gerd@gnu.org>
parents: 30159
diff changeset
1250 Lisp_Object
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1251 safe_eval (sexpr)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1252 Lisp_Object sexpr;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1253 {
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
1254 int count = BINDING_STACK_SIZE ();
30216
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1255 struct gcpro gcpro1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1256 Lisp_Object val;
30216
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1257
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1258 GCPRO1 (sexpr);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1259 specbind (Qinhibit_redisplay, Qt);
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1260 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
1261 UNGCPRO;
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1262 return unbind_to (count, val);
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1263 }
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1264
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1265
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1266 /* 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
1267 Return the result, or nil if something went wrong. */
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1268
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1269 Lisp_Object
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1270 safe_call (nargs, args)
30216
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1271 int nargs;
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1272 Lisp_Object *args;
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1273 {
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
1274 int count = BINDING_STACK_SIZE ();
30216
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1275 Lisp_Object val;
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1276 struct gcpro gcpro1;
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1277
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1278 GCPRO1 (args[0]);
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1279 gcpro1.nvars = nargs;
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1280 specbind (Qinhibit_redisplay, Qt);
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1281 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
1282 safe_eval_handler);
30216
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
1283 UNGCPRO;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1284 return unbind_to (count, val);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1287
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1288 /* Call function FN with one argument ARG.
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1289 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
1290
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1291 Lisp_Object
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1292 safe_call1 (fn, arg)
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1293 Lisp_Object fn, arg;
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1294 {
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1295 Lisp_Object args[2];
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1296 args[0] = fn;
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1297 args[1] = arg;
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1298 return safe_call (2, args);
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1299 }
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1300
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
1301
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1302
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1303 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1304 Debugging
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 #if 0
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 /* Define CHECK_IT to perform sanity checks on iterators.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1310 This is for debugging. It is too slow to do unconditionally. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1311
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1312 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1313 check_it (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1314 struct it *it;
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 (it->method == next_element_from_string)
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 xassert (STRINGP (it->string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1319 xassert (IT_STRING_CHARPOS (*it) >= 0);
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 else if (it->method == next_element_from_buffer)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1322 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1323 /* Check that character and byte positions agree. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1324 xassert (IT_CHARPOS (*it) == BYTE_TO_CHAR (IT_BYTEPOS (*it)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1325 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1326
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1327 if (it->dpvec)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1328 xassert (it->current.dpvec_index >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1329 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1330 xassert (it->current.dpvec_index < 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1331 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1332
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1333 #define CHECK_IT(IT) check_it ((IT))
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 #else /* not 0 */
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_IT(IT) (void) 0
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 #endif /* not 0 */
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1342 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1343
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1344 /* 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
1345 to be---the last row in the current matrix displaying text. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1348 check_window_end (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1349 struct window *w;
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 if (!MINI_WINDOW_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1352 && !NILP (w->window_end_valid))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1353 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1354 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1355 xassert ((row = MATRIX_ROW (w->current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1356 XFASTINT (w->window_end_vpos)),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1357 !row->enabled_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1358 || MATRIX_ROW_DISPLAYS_TEXT_P (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1359 || MATRIX_ROW_VPOS (row, w->current_matrix) == 0));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1360 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1361 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1362
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1363 #define CHECK_WINDOW_END(W) check_window_end ((W))
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 #else /* not GLYPH_DEBUG */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1366
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1367 #define CHECK_WINDOW_END(W) (void) 0
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 #endif /* not GLYPH_DEBUG */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1370
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1371
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1372
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1373 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1374 Iterator initialization
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1375 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1376
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1377 /* Initialize IT for displaying current_buffer in window W, starting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1378 at character position CHARPOS. CHARPOS < 0 means that no buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1379 position is specified which is useful when the iterator is assigned
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1380 a position later. BYTEPOS is the byte position corresponding to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1381 CHARPOS. BYTEPOS <= 0 means compute it from CHARPOS.
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 ROW is not null, calls to produce_glyphs with IT as parameter
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1384 will produce glyphs in that row.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1385
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1386 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
1387 DEFAULT_FACE_ID for normal text, MODE_LINE_FACE_ID or
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1388 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
1389 displaying the tool-bar.
25012
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 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
1392 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
1393 corresponding mode line glyph row of the desired matrix of W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1394
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1395 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1396 init_iterator (it, w, charpos, bytepos, row, base_face_id)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1397 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1398 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1399 int charpos, bytepos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1400 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1401 enum face_id base_face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1402 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1403 int highlight_region_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1404
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1405 /* Some precondition checks. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1406 xassert (w != NULL && it != NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1407 xassert (charpos < 0 || (charpos > 0 && charpos <= ZV));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1408
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1409 /* If face attributes have been changed since the last redisplay,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1410 free realized faces now because they depend on face definitions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1411 that might have changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1412 if (face_change_count)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1413 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1414 face_change_count = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1415 free_all_realized_faces (Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1416 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1417
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1418 /* 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
1419 appropriate. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1420 if (row == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1421 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1422 if (base_face_id == MODE_LINE_FACE_ID)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1423 row = MATRIX_MODE_LINE_ROW (w->desired_matrix);
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1424 else if (base_face_id == HEADER_LINE_FACE_ID)
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1425 row = MATRIX_HEADER_LINE_ROW (w->desired_matrix);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1426 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1427
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1428 /* Clear IT. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1429 bzero (it, sizeof *it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1430 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1431 it->current.dpvec_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1432 it->base_face_id = base_face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1433
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1434 /* The window in which we iterate over current_buffer: */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1435 XSETWINDOW (it->window, w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1436 it->w = w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1437 it->f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1438
28692
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
1439 /* 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
1440 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
1441 && FRAME_WINDOW_P (it->f))
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
1442 {
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
1443 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
1444 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
1445 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
1446 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
1447 }
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
1448
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1449 /* If realized faces have been removed, e.g. because of face
34664
acdda5d1ff29 (init_iterator): If noninteractive, and the frame's
Gerd Moellmann <gerd@gnu.org>
parents: 34582
diff changeset
1450 attribute changes of named faces, recompute them. When running
acdda5d1ff29 (init_iterator): If noninteractive, and the frame's
Gerd Moellmann <gerd@gnu.org>
parents: 34582
diff changeset
1451 in batch mode, the face cache of Vterminal_frame is null. If
acdda5d1ff29 (init_iterator): If noninteractive, and the frame's
Gerd Moellmann <gerd@gnu.org>
parents: 34582
diff changeset
1452 we happen to get called, make a dummy face cache. */
35005
2b83125ab28b (handle_single_display_prop): Return if frame is
Andrew Innes <andrewi@gnu.org>
parents: 34987
diff changeset
1453 if (
2b83125ab28b (handle_single_display_prop): Return if frame is
Andrew Innes <andrewi@gnu.org>
parents: 34987
diff changeset
1454 #ifndef WINDOWSNT
2b83125ab28b (handle_single_display_prop): Return if frame is
Andrew Innes <andrewi@gnu.org>
parents: 34987
diff changeset
1455 noninteractive &&
2b83125ab28b (handle_single_display_prop): Return if frame is
Andrew Innes <andrewi@gnu.org>
parents: 34987
diff changeset
1456 #endif
2b83125ab28b (handle_single_display_prop): Return if frame is
Andrew Innes <andrewi@gnu.org>
parents: 34987
diff changeset
1457 FRAME_FACE_CACHE (it->f) == NULL)
34664
acdda5d1ff29 (init_iterator): If noninteractive, and the frame's
Gerd Moellmann <gerd@gnu.org>
parents: 34582
diff changeset
1458 init_frame_faces (it->f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1459 if (FRAME_FACE_CACHE (it->f)->used == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1460 recompute_basic_faces (it->f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1461
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1462 /* Current value of the `space-width', and 'height' properties. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1463 it->space_width = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1464 it->font_height = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1465
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1466 /* Are control characters displayed as `^C'? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1467 it->ctl_arrow_p = !NILP (current_buffer->ctl_arrow);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1468
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1469 /* -1 means everything between a CR and the following line end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1470 is invisible. >0 means lines indented more than this value are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1471 invisible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1472 it->selective = (INTEGERP (current_buffer->selective_display)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1473 ? XFASTINT (current_buffer->selective_display)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1474 : (!NILP (current_buffer->selective_display)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1475 ? -1 : 0));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1476 it->selective_display_ellipsis_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1477 = !NILP (current_buffer->selective_display_ellipses);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1478
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1479 /* Display table to use. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1480 it->dp = window_display_table (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1481
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1482 /* Are multibyte characters enabled in current_buffer? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1483 it->multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1484
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1485 /* Non-zero if we should highlight the region. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1486 highlight_region_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1487 = (!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1488 && !NILP (current_buffer->mark_active)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1489 && XMARKER (current_buffer->mark)->buffer != 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1490
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1491 /* Set IT->region_beg_charpos and IT->region_end_charpos to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1492 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
1493 -1 to indicate no region. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1494 if (highlight_region_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1495 /* Maybe highlight only in selected window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1496 && (/* Either show region everywhere. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1497 highlight_nonselected_windows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1498 /* Or show region in the selected window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1499 || w == XWINDOW (selected_window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1500 /* 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
1501 the window the mini-buffer refers to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1502 || (MINI_WINDOW_P (XWINDOW (selected_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1503 && w == XWINDOW (Vminibuf_scroll_window))))
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 int charpos = marker_position (current_buffer->mark);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1506 it->region_beg_charpos = min (PT, charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1507 it->region_end_charpos = max (PT, charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1508 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1509 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1510 it->region_beg_charpos = it->region_end_charpos = -1;
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 /* Get the position at which the redisplay_end_trigger hook should
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1513 be run, if it is to be run at all. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1514 if (MARKERP (w->redisplay_end_trigger)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1515 && XMARKER (w->redisplay_end_trigger)->buffer != 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1516 it->redisplay_end_trigger_charpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1517 = marker_position (w->redisplay_end_trigger);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1518 else if (INTEGERP (w->redisplay_end_trigger))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1519 it->redisplay_end_trigger_charpos = XINT (w->redisplay_end_trigger);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1520
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1521 /* Correct bogus values of tab_width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1522 it->tab_width = XINT (current_buffer->tab_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1523 if (it->tab_width <= 0 || it->tab_width > 1000)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1524 it->tab_width = 8;
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 /* Are lines in the display truncated? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1527 it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1528 = (base_face_id != DEFAULT_FACE_ID
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1529 || XINT (it->w->hscroll)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1530 || (truncate_partial_width_windows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1531 && !WINDOW_FULL_WIDTH_P (it->w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1532 || !NILP (current_buffer->truncate_lines));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1533
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1534 /* Get dimensions of truncation and continuation glyphs. These are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1535 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
1536 frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1537 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1538 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1539 if (it->truncate_lines_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1540 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1541 /* We will need the truncation glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1542 xassert (it->glyph_row == NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1543 produce_special_glyphs (it, IT_TRUNCATION);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1544 it->truncation_pixel_width = it->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1545 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1546 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1547 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1548 /* We will need the continuation glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1549 xassert (it->glyph_row == NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1550 produce_special_glyphs (it, IT_CONTINUATION);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1551 it->continuation_pixel_width = it->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1552 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1553
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1554 /* Reset these values to zero becaue the produce_special_glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1555 above has changed them. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1556 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
1557 it->phys_ascent = it->phys_descent = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1558 }
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 /* Set this after getting the dimensions of truncation and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1561 continuation glyphs, so that we don't produce glyphs when calling
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1562 produce_special_glyphs, above. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1563 it->glyph_row = row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1564 it->area = TEXT_AREA;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1565
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1566 /* Get the dimensions of the display area. The display area
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1567 consists of the visible window area plus a horizontally scrolled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1568 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
1569 start of this total display area. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1570 if (base_face_id != DEFAULT_FACE_ID)
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 /* Mode lines, menu bar in terminal frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1573 it->first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1574 it->last_visible_x = XFASTINT (w->width) * CANON_X_UNIT (it->f);
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 else
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->first_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1579 = XFASTINT (it->w->hscroll) * CANON_X_UNIT (it->f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1580 it->last_visible_x = (it->first_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1581 + window_box_width (w, TEXT_AREA));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1582
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1583 /* If we truncate lines, leave room for the truncator glyph(s) at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1584 the right margin. Otherwise, leave room for the continuation
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1585 glyph(s). Truncation and continuation glyphs are not inserted
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1586 for window-based redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1587 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1588 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1589 if (it->truncate_lines_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1590 it->last_visible_x -= it->truncation_pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1591 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1592 it->last_visible_x -= it->continuation_pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1593 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1594
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1595 it->header_line_p = WINDOW_WANTS_HEADER_LINE_P (w);
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1596 it->current_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w) + w->vscroll;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1597 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1598
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1599 /* Leave room for a border glyph. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1600 if (!FRAME_WINDOW_P (it->f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1601 && !WINDOW_RIGHTMOST_P (it->w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1602 it->last_visible_x -= 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 it->last_visible_y = window_text_bottom_y (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1605
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1606 /* For mode lines and alike, arrange for the first glyph having a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1607 left box line if the face specifies a box. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1608 if (base_face_id != DEFAULT_FACE_ID)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1609 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1610 struct face *face;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1611
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1612 it->face_id = base_face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1613
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1614 /* If we have a boxed mode line, make the first character appear
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1615 with a left box line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1616 face = FACE_FROM_ID (it->f, base_face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1617 if (face->box != FACE_NO_BOX)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1618 it->start_of_box_run_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1619 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1620
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1621 /* If a buffer position was specified, set the iterator there,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1622 getting overlays and face properties from that position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1623 if (charpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1624 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1625 it->end_charpos = ZV;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1626 it->face_id = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1627 IT_CHARPOS (*it) = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1628
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1629 /* Compute byte position if not specified. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1630 if (bytepos <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1631 IT_BYTEPOS (*it) = CHAR_TO_BYTE (charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1632 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1633 IT_BYTEPOS (*it) = bytepos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1634
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1635 /* Compute faces etc. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1636 reseat (it, it->current.pos, 1);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1639 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1640 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1641
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1642
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1643 /* Initialize IT for the display of window W with window start POS. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1644
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1645 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1646 start_display (it, w, pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1647 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1648 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1649 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1650 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1651 int start_at_line_beg_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1652 struct glyph_row *row;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
1653 int first_vpos = WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1654 int first_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1655
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1656 row = w->desired_matrix->rows + first_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1657 init_iterator (it, w, CHARPOS (pos), BYTEPOS (pos), row, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1658 first_y = it->current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1659
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1660 /* 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
1661 start. This makes sure that we take continuation lines into
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1662 account. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1663 start_at_line_beg_p = (CHARPOS (pos) == BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1664 || FETCH_BYTE (BYTEPOS (pos) - 1) == '\n');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1665 if (!start_at_line_beg_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1666 reseat_at_previous_visible_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1667
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1668 /* 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
1669 get the correct continuation_lines_width and current_x. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1670 if (!start_at_line_beg_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1671 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1672 move_it_to (it, CHARPOS (pos), -1, -1, -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1673
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1674 /* 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
1675 multi-glyph character (e.g. a control character displayed as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1676 \003, or in the middle of an overlay string). In this case
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1677 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
1678 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
1679 if (!it->truncate_lines_p)
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1680 {
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1681 if (it->current_x > 0)
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1682 {
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1683 if (it->current.dpvec_index >= 0
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1684 || it->current.overlay_string_index >= 0)
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1685 {
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
1686 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
1687 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
1688 }
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1689
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1690 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
1691 }
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1692
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1693 /* 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
1694 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
1695 fields in the iterator structure. */
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
1696 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
1697 it->max_phys_ascent = it->max_phys_descent = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1698 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1699
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1700 it->current_y = first_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1701 it->vpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1702 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1703 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1704
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1705 #if 0 /* Don't assert the following because start_display is sometimes
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1706 called intentionally with a window start that is not at a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1707 line start. Please leave this code in as a comment. */
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 /* Window start should be on a line start, now. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1710 xassert (it->continuation_lines_width
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1711 || IT_CHARPOS (it) == BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1712 || FETCH_BYTE (IT_BYTEPOS (it) - 1) == '\n');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1713 #endif /* 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1714 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1717 /* Initialize IT for stepping through current_buffer in window W,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1718 starting at position POS that includes overlay string and display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1719 vector/ control character translation position information. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1720
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1721 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1722 init_from_display_pos (it, w, pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1723 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1724 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1725 struct display_pos *pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1726 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1727 /* Keep in mind: the call to reseat in init_iterator skips invisible
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1728 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
1729 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
1730 overlay starts there with an after-string, and the overlay has an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1731 invisible property. Since we don't skip invisible text in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1732 display_line and elsewhere immediately after consuming the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1733 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
1734 but the call to init_iterator below will move us to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1735 after-string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1736 init_iterator (it, w, CHARPOS (pos->pos), BYTEPOS (pos->pos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1737 NULL, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1738
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1739 /* If position is within an overlay string, set up IT to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1740 the right overlay string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1741 if (pos->overlay_string_index >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1742 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1743 int relative_index;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1744
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1745 /* We already have the first chunk of overlay strings in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1746 IT->overlay_strings. Load more until the one for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1747 pos->overlay_string_index is in IT->overlay_strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1748 if (pos->overlay_string_index >= OVERLAY_STRING_CHUNK_SIZE)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1749 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1750 int n = pos->overlay_string_index / OVERLAY_STRING_CHUNK_SIZE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1751 it->current.overlay_string_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1752 while (n--)
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 load_overlay_strings (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1755 it->current.overlay_string_index += OVERLAY_STRING_CHUNK_SIZE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1756 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1757 }
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 it->current.overlay_string_index = pos->overlay_string_index;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1760 relative_index = (it->current.overlay_string_index
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1761 % OVERLAY_STRING_CHUNK_SIZE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1762 it->string = it->overlay_strings[relative_index];
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
1763 xassert (STRINGP (it->string));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1764 it->current.string_pos = pos->string_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1765 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1766 }
33863
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1767 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
1768 {
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1769 /* 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
1770 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
1771 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
1772 also ``processed'' overlay strings at ZV. */
34851
452349a9192a (init_from_display_pos): Pop until the iterator's
Gerd Moellmann <gerd@gnu.org>
parents: 34847
diff changeset
1773 while (it->sp)
452349a9192a (init_from_display_pos): Pop until the iterator's
Gerd Moellmann <gerd@gnu.org>
parents: 34847
diff changeset
1774 pop_it (it);
33863
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1775 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
1776 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
1777 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
1778 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
1779 }
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1780
2e449f784ca7 (init_from_display_pos): If POS says we're already after
Gerd Moellmann <gerd@gnu.org>
parents: 33840
diff changeset
1781 if (CHARPOS (pos->string_pos) >= 0)
25012
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 /* Recorded position is not in an overlay string, but in another
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1784 string. This can only be a string from a `display' property.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1785 IT should already be filled with that string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1786 it->current.string_pos = pos->string_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1787 xassert (STRINGP (it->string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1788 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1789
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1790 /* Restore position in display vector translations or control
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1791 character translations. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1792 if (pos->dpvec_index >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1793 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1794 /* This fills IT->dpvec. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1795 get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1796 xassert (it->dpvec && it->current.dpvec_index == 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1797 it->current.dpvec_index = pos->dpvec_index;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1798 }
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 CHECK_IT (it);
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 /* Initialize IT for stepping through current_buffer in window W
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1805 starting at ROW->start. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1808 init_to_row_start (it, w, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1809 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1810 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1811 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1812 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1813 init_from_display_pos (it, w, &row->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1814 it->continuation_lines_width = row->continuation_lines_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1815 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1816 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1817
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1818
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1819 /* Initialize IT for stepping through current_buffer in window W
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1820 starting in the line following ROW, i.e. starting at ROW->end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1821
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1822 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1823 init_to_row_end (it, w, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1824 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1825 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1826 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1827 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1828 init_from_display_pos (it, w, &row->end);
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 if (row->continued_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1831 it->continuation_lines_width = (row->continuation_lines_width
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1832 + row->pixel_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1833 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1834 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1835
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1836
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1837
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 Text properties
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1843 /* Called when IT reaches IT->stop_charpos. Handle text property and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1844 overlay changes. Set IT->stop_charpos to the next position where
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1845 to stop. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1848 handle_stop (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1849 struct it *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 enum prop_handled handled;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1852 int handle_overlay_change_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1853 struct props *p;
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 it->dpvec = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1856 it->current.dpvec_index = -1;
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 do
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 handled = HANDLED_NORMALLY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1861
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1862 /* Call text property handlers. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1863 for (p = it_props; p->handler; ++p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1864 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1865 handled = p->handler (it);
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
1866
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1867 if (handled == HANDLED_RECOMPUTE_PROPS)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1868 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1869 else if (handled == HANDLED_RETURN)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1870 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1871 else if (handled == HANDLED_OVERLAY_STRING_CONSUMED)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1872 handle_overlay_change_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1873 }
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 if (handled != HANDLED_RECOMPUTE_PROPS)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1876 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1877 /* Don't check for overlay strings below when set to deliver
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1878 characters from a display vector. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1879 if (it->method == next_element_from_display_vector)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1880 handle_overlay_change_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1881
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1882 /* Handle overlay changes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1883 if (handle_overlay_change_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1884 handled = handle_overlay_change (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1885
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1886 /* Determine where to stop next. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1887 if (handled == HANDLED_NORMALLY)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1888 compute_stop_pos (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1889 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1890 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1891 while (handled == HANDLED_RECOMPUTE_PROPS);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1894
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1895 /* Compute IT->stop_charpos from text property and overlay change
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1896 information for IT's current position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1897
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1898 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1899 compute_stop_pos (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1900 struct it *it;
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 register INTERVAL iv, next_iv;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1903 Lisp_Object object, limit, position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1904
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1905 /* If nowhere else, stop at the end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1906 it->stop_charpos = it->end_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1907
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1908 if (STRINGP (it->string))
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 /* Strings are usually short, so don't limit the search for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1911 properties. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1912 object = it->string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1913 limit = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1914 XSETFASTINT (position, IT_STRING_CHARPOS (*it));
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1917 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1918 int charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1919
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1920 /* If next overlay change is in front of the current stop pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1921 (which is IT->end_charpos), stop there. Note: value of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1922 next_overlay_change is point-max if no overlay change
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1923 follows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1924 charpos = next_overlay_change (IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1925 if (charpos < it->stop_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1926 it->stop_charpos = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1927
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1928 /* If showing the region, we have to stop at the region
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1929 start or end because the face might change there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1930 if (it->region_beg_charpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1931 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1932 if (IT_CHARPOS (*it) < it->region_beg_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1933 it->stop_charpos = min (it->stop_charpos, it->region_beg_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1934 else if (IT_CHARPOS (*it) < it->region_end_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1935 it->stop_charpos = min (it->stop_charpos, it->region_end_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1936 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1937
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1938 /* Set up variables for computing the stop position from text
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1939 property changes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1940 XSETBUFFER (object, current_buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1941 XSETFASTINT (limit, IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1942 XSETFASTINT (position, IT_CHARPOS (*it));
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1945
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1946 /* Get the interval containing IT's position. Value is a null
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1947 interval if there isn't such an interval. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1948 iv = validate_interval_range (object, &position, &position, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1949 if (!NULL_INTERVAL_P (iv))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1950 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1951 Lisp_Object values_here[LAST_PROP_IDX];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1952 struct props *p;
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 /* Get properties here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1955 for (p = it_props; p->handler; ++p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1956 values_here[p->idx] = textget (iv->plist, *p->name);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1957
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1958 /* Look for an interval following iv that has different
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1959 properties. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1960 for (next_iv = next_interval (iv);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1961 (!NULL_INTERVAL_P (next_iv)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1962 && (NILP (limit)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1963 || XFASTINT (limit) > next_iv->position));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1964 next_iv = next_interval (next_iv))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1965 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1966 for (p = it_props; p->handler; ++p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1967 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1968 Lisp_Object new_value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1969
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1970 new_value = textget (next_iv->plist, *p->name);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1971 if (!EQ (values_here[p->idx], new_value))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1972 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1973 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1974
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1975 if (p->handler)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1976 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1977 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1978
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1979 if (!NULL_INTERVAL_P (next_iv))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1980 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1981 if (INTEGERP (limit)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1982 && next_iv->position >= XFASTINT (limit))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1983 /* No text property change up to limit. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1984 it->stop_charpos = min (XFASTINT (limit), it->stop_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1985 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1986 /* Text properties change in next_iv. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1987 it->stop_charpos = min (it->stop_charpos, next_iv->position);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1988 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1989 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1990
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1991 xassert (STRINGP (it->string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1992 || (it->stop_charpos >= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1993 && it->stop_charpos >= IT_CHARPOS (*it)));
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1996
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1997 /* Return the position of the next overlay change after POS in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1998 current_buffer. Value is point-max if no overlay change
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
1999 follows. This is like `next-overlay-change' but doesn't use
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2000 xmalloc. */
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 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2003 next_overlay_change (pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2004 int pos;
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 int noverlays;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2007 int endpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2008 Lisp_Object *overlays;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2009 int len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2010 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2011
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2012 /* Get all overlays at the given position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2013 len = 10;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2014 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
2015 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2016 if (noverlays > len)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2017 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2018 len = noverlays;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2019 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
2020 noverlays = overlays_at (pos, 0, &overlays, &len, &endpos, NULL, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2021 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2022
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2023 /* If any of these overlays ends before endpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2024 use its ending point instead. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2025 for (i = 0; i < noverlays; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2026 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2027 Lisp_Object oend;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2028 int oendpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2029
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2030 oend = OVERLAY_END (overlays[i]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2031 oendpos = OVERLAY_POSITION (oend);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2032 endpos = min (endpos, oendpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2033 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2034
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2035 return endpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2036 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2037
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2038
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2039
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2040 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2041 Fontification
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2042 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2043
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2044 /* Handle changes in the `fontified' property of the current buffer by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2045 calling hook functions from Qfontification_functions to fontify
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2046 regions of text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2047
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2048 static enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2049 handle_fontified_prop (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2050 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2051 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2052 Lisp_Object prop, pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2053 enum prop_handled handled = HANDLED_NORMALLY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2054
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2055 /* Get the value of the `fontified' property at IT's current buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2056 position. (The `fontified' property doesn't have a special
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2057 meaning in strings.) If the value is nil, call functions from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2058 Qfontification_functions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2059 if (!STRINGP (it->string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2060 && it->s == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2061 && !NILP (Vfontification_functions)
31610
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2062 && !NILP (Vrun_hooks)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2063 && (pos = make_number (IT_CHARPOS (*it)),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2064 prop = Fget_char_property (pos, Qfontified, Qnil),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2065 NILP (prop)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2066 {
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
2067 int count = BINDING_STACK_SIZE ();
31610
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2068 Lisp_Object val;
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2069
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2070 val = Vfontification_functions;
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2071 specbind (Qfontification_functions, Qnil);
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2072 specbind (Qafter_change_functions, Qnil);
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2073
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2074 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
2075 safe_call1 (val, pos);
31610
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2076 else
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2077 {
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2078 Lisp_Object globals, fn;
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2079 struct gcpro gcpro1, gcpro2;
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2080
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2081 globals = Qnil;
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2082 GCPRO2 (val, globals);
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2083
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2084 for (; CONSP (val); val = XCDR (val))
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2085 {
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2086 fn = XCAR (val);
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2087
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2088 if (EQ (fn, Qt))
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2089 {
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2090 /* 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
2091 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
2092 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
2093 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
2094 loop. */
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2095 for (globals = Fdefault_value (Qfontification_functions);
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2096 CONSP (globals);
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2097 globals = XCDR (globals))
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2098 {
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2099 fn = XCAR (globals);
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2100 if (!EQ (fn, Qt))
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
2101 safe_call1 (fn, pos);
31610
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2102 }
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2103 }
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2104 else
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
2105 safe_call1 (fn, pos);
31610
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2106 }
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2107
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2108 UNGCPRO;
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2109 }
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2110
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
2111 unbind_to (count, Qnil);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2112
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2113 /* Return HANDLED_RECOMPUTE_PROPS only if function fontified
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2114 something. This avoids an endless loop if they failed to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2115 fontify the text for which reason ever. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2116 if (!NILP (Fget_char_property (pos, Qfontified, Qnil)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2117 handled = HANDLED_RECOMPUTE_PROPS;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2118 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2119
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2120 return handled;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2121 }
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
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 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2126 Faces
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2127 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2128
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2129 /* Set up iterator IT from face properties at its current position.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2130 Called from handle_stop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2131
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2132 static enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2133 handle_face_prop (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2134 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2135 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2136 int new_face_id, next_stop;
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 if (!STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2139 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2140 new_face_id
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2141 = face_at_buffer_position (it->w,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2142 IT_CHARPOS (*it),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2143 it->region_beg_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2144 it->region_end_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2145 &next_stop,
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 + TEXT_PROP_DISTANCE_LIMIT),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2148 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2149
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2150 /* Is this a start of a run of characters with box face?
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2151 Caveat: this can be called for a freshly initialized
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2152 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
2153 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
2154 box, all characters up to limit will have one. But, as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2155 usual, we don't know whether limit is really the end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2156 if (new_face_id != it->face_id)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2157 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2158 struct face *new_face = FACE_FROM_ID (it->f, new_face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2159
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2160 /* 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
2161 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
2162 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
2163 iterator will be -1 if this is the initial call that gets
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2164 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
2165 position and see whether there is a face != new_face_id. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2166 it->start_of_box_run_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2167 = (new_face->box != FACE_NO_BOX
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2168 && (it->face_id >= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2169 || IT_CHARPOS (*it) == BEG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2170 || new_face_id != face_before_it_pos (it)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2171 it->face_box_p = new_face->box != FACE_NO_BOX;
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2174 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2175 {
34288
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2176 int base_face_id, bufpos;
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2177
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2178 if (it->current.overlay_string_index >= 0)
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2179 bufpos = IT_CHARPOS (*it);
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2180 else
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2181 bufpos = 0;
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2182
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2183 /* For strings from a buffer, i.e. overlay strings or strings
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2184 from a `display' property, use the face at IT's current
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2185 buffer position as the base face to merge with, so that
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2186 overlay strings appear in the same face as surrounding
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2187 text, unless they specify their own faces. */
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2188 base_face_id = underlying_face_id (it);
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2189
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2190 new_face_id = face_at_string_position (it->w,
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2191 it->string,
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2192 IT_STRING_CHARPOS (*it),
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2193 bufpos,
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2194 it->region_beg_charpos,
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2195 it->region_end_charpos,
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2196 &next_stop,
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2197 base_face_id);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2198
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2199 #if 0 /* This shouldn't be neccessary. Let's check it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2200 /* 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
2201 use the mode line face instead of the frame's default face. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2202 if (it->glyph_row == MATRIX_MODE_LINE_ROW (it->w->desired_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2203 && new_face_id == DEFAULT_FACE_ID)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2204 new_face_id = MODE_LINE_FACE_ID;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2205 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2206
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2207 /* Is this a start of a run of characters with box? Caveat:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2208 this can be called for a freshly allocated iterator; face_id
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2209 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
2210 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
2211 box, all characters up to that position will have a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2212 box. But, as usual, we don't know whether that position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2213 is really the end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2214 if (new_face_id != it->face_id)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2215 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2216 struct face *new_face = FACE_FROM_ID (it->f, new_face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2217 struct face *old_face = FACE_FROM_ID (it->f, it->face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2218
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2219 /* 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
2220 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
2221 shadow on the left side. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2222 it->start_of_box_run_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2223 = new_face->box && (old_face == NULL || !old_face->box);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2224 it->face_box_p = new_face->box != FACE_NO_BOX;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2225 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2226 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2227
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2228 it->face_id = new_face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2229 return HANDLED_NORMALLY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2230 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2231
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2232
34288
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2233 /* Return the ID of the face ``underlying'' IT's current position,
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2234 which is in a string. If the iterator is associated with a
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2235 buffer, return the face at IT's current buffer position.
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2236 Otherwise, use the iterator's base_face_id. */
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2237
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2238 static int
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2239 underlying_face_id (it)
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2240 struct it *it;
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2241 {
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2242 int face_id = it->base_face_id, i;
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2243
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2244 xassert (STRINGP (it->string));
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2245
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2246 for (i = it->sp - 1; i >= 0; --i)
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2247 if (NILP (it->stack[i].string))
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2248 face_id = it->stack[i].face_id;
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2249
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2250 return face_id;
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2251 }
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2252
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2253
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2254 /* Compute the face one character before or after the current position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2255 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
2256 position. Value is the id of the face. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2257
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2258 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2259 face_before_or_after_it_pos (it, before_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2260 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2261 int before_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2262 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2263 int face_id, limit;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2264 int next_check_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2265 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2266
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2267 xassert (it->s == NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2268
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2269 if (STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2270 {
34288
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2271 int bufpos, base_face_id;
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2272
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2273 /* No face change past the end of the string (for the case
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2274 we are padding with spaces). No face change before the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2275 string start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2276 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2277 || (IT_STRING_CHARPOS (*it) == 0 && before_p))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2278 return it->face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2279
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2280 /* Set pos to the position before or after IT's current position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2281 if (before_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2282 pos = string_pos (IT_STRING_CHARPOS (*it) - 1, it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2283 else
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2284 /* 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
2285 composition. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2286 pos = (it->what == IT_COMPOSITION
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2287 ? 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
2288 : string_pos (IT_STRING_CHARPOS (*it) + 1, it->string));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2289
34288
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2290 if (it->current.overlay_string_index >= 0)
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2291 bufpos = IT_CHARPOS (*it);
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2292 else
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2293 bufpos = 0;
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2294
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2295 base_face_id = underlying_face_id (it);
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2296
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2297 /* Get the face for ASCII, or unibyte. */
34288
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2298 face_id = face_at_string_position (it->w,
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2299 it->string,
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2300 CHARPOS (pos),
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2301 bufpos,
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2302 it->region_beg_charpos,
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2303 it->region_end_charpos,
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2304 &next_check_charpos,
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2305 base_face_id);
25012
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 /* Correct the face for charsets different from ASCII. Do it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2308 for the multibyte case only. The face returned above is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2309 suitable for unibyte text if IT->string is unibyte. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2310 if (STRING_MULTIBYTE (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2311 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2312 unsigned char *p = XSTRING (it->string)->data + BYTEPOS (pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2313 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
2314 int c, len;
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
2315 struct face *face = FACE_FROM_ID (it->f, face_id);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2316
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
2317 c = string_char_and_length (p, rest, &len);
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
2318 face_id = FACE_FOR_CHAR (it->f, face, c);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2319 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2320 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2321 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2322 {
25242
28067247ff90 (face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents: 25197
diff changeset
2323 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
2324 || (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
2325 return it->face_id;
28067247ff90 (face_before_or_after_it_pos): If position after
Gerd Moellmann <gerd@gnu.org>
parents: 25197
diff changeset
2326
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2327 limit = IT_CHARPOS (*it) + TEXT_PROP_DISTANCE_LIMIT;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2328 pos = it->current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2329
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2330 if (before_p)
28362
a568b23317fe (face_before_or_after_it_pos): Pass multibyteness
Gerd Moellmann <gerd@gnu.org>
parents: 28228
diff changeset
2331 DEC_TEXT_POS (pos, it->multibyte_p);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2332 else
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2333 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2334 if (it->what == IT_COMPOSITION)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2335 /* 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
2336 composition. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2337 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
2338 else
28362
a568b23317fe (face_before_or_after_it_pos): Pass multibyteness
Gerd Moellmann <gerd@gnu.org>
parents: 28228
diff changeset
2339 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
2340 }
34288
28c3e736ae57 (underlying_face_id): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34252
diff changeset
2341
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2342 /* Determine face for CHARSET_ASCII, or unibyte. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2343 face_id = face_at_buffer_position (it->w,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2344 CHARPOS (pos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2345 it->region_beg_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2346 it->region_end_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2347 &next_check_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2348 limit, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2349
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2350 /* Correct the face for charsets different from ASCII. Do it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2351 for the multibyte case only. The face returned above is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2352 suitable for unibyte text if current_buffer is unibyte. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2353 if (it->multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2354 {
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
2355 int c = FETCH_MULTIBYTE_CHAR (CHARPOS (pos));
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
2356 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
2357 face_id = FACE_FOR_CHAR (it->f, face, c);
25012
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 return face_id;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2364
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2365
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2366 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2367 Invisible text
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2368 ***********************************************************************/
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 /* Set up iterator IT from invisible properties at its current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2371 position. Called from handle_stop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2372
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2373 static enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2374 handle_invisible_prop (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2375 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2376 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2377 enum prop_handled handled = HANDLED_NORMALLY;
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 if (STRINGP (it->string))
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 extern Lisp_Object Qinvisible;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2382 Lisp_Object prop, end_charpos, limit, charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2383
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2384 /* Get the value of the invisible text property at the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2385 current position. Value will be nil if there is no such
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2386 property. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2387 XSETFASTINT (charpos, IT_STRING_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2388 prop = Fget_text_property (charpos, Qinvisible, it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2389
29191
3977c8167022 (handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents: 29185
diff changeset
2390 if (!NILP (prop)
3977c8167022 (handle_invisible_prop): Don't try to skip over
Gerd Moellmann <gerd@gnu.org>
parents: 29185
diff changeset
2391 && IT_STRING_CHARPOS (*it) < it->end_charpos)
25012
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 handled = HANDLED_RECOMPUTE_PROPS;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2394
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2395 /* Get the position at which the next change of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2396 invisible text property can be found in IT->string.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2397 Value will be nil if the property value is the same for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2398 all the rest of IT->string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2399 XSETINT (limit, XSTRING (it->string)->size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2400 end_charpos = Fnext_single_property_change (charpos, Qinvisible,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2401 it->string, limit);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2402
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2403 /* Text at current position is invisible. The next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2404 change in the property is at position end_charpos.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2405 Move IT's current position to that position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2406 if (INTEGERP (end_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2407 && XFASTINT (end_charpos) < XFASTINT (limit))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2408 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2409 struct text_pos old;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2410 old = it->current.string_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2411 IT_STRING_CHARPOS (*it) = XFASTINT (end_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2412 compute_string_pos (&it->current.string_pos, old, it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2413 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2414 else
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 /* The rest of the string is invisible. If this is an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2417 overlay string, proceed with the next overlay string
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2418 or whatever comes and return a character from there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2419 if (it->current.overlay_string_index >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2420 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2421 next_overlay_string (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2422 /* Don't check for overlay strings when we just
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2423 finished processing them. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2424 handled = HANDLED_OVERLAY_STRING_CONSUMED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2425 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2426 else
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_String *s = XSTRING (it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2429 IT_STRING_CHARPOS (*it) = s->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2430 IT_STRING_BYTEPOS (*it) = STRING_BYTES (s);
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 }
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2435 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2436 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2437 int visible_p, newpos, next_stop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2438 Lisp_Object pos, prop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2439
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2440 /* First of all, is there invisible text at this position? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2441 XSETFASTINT (pos, IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2442 prop = Fget_char_property (pos, Qinvisible, it->window);
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 /* 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
2445 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
2446 && IT_CHARPOS (*it) < it->end_charpos)
25012
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 /* Record whether we have to display an ellipsis for the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2449 invisible text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2450 int display_ellipsis_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2451 = TEXT_PROP_MEANS_INVISIBLE_WITH_ELLIPSIS (prop);
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 handled = HANDLED_RECOMPUTE_PROPS;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2454
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2455 /* Loop skipping over invisible text. The loop is left at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2456 ZV or with IT on the first char being visible again. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2457 do
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 /* Try to skip some invisible text. Return value is the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2460 position reached which can be equal to IT's position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2461 if there is nothing invisible here. This skips both
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2462 over invisible text properties and overlays with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2463 invisible property. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2464 newpos = skip_invisible (IT_CHARPOS (*it),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2465 &next_stop, ZV, it->window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2466
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2467 /* If we skipped nothing at all we weren't at invisible
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2468 text in the first place. If everything to the end of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2469 the buffer was skipped, end the loop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2470 if (newpos == IT_CHARPOS (*it) || newpos >= ZV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2471 visible_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2472 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2473 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2474 /* We skipped some characters but not necessarily
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2475 all there are. Check if we ended up on visible
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2476 text. Fget_char_property returns the property of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2477 the char before the given position, i.e. if we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2478 get visible_p = 1, this means that the char at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2479 newpos is visible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2480 XSETFASTINT (pos, newpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2481 prop = Fget_char_property (pos, Qinvisible, it->window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2482 visible_p = !TEXT_PROP_MEANS_INVISIBLE (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2483 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2484
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2485 /* If we ended up on invisible text, proceed to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2486 skip starting with next_stop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2487 if (!visible_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2488 IT_CHARPOS (*it) = next_stop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2489 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2490 while (!visible_p);
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 /* The position newpos is now either ZV or on visible text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2493 IT_CHARPOS (*it) = newpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2494 IT_BYTEPOS (*it) = CHAR_TO_BYTE (newpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2495
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2496 /* Maybe return `...' next for the end of the invisible text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2497 if (display_ellipsis_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2498 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2499 if (it->dp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2500 && VECTORP (DISP_INVIS_VECTOR (it->dp)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2501 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2502 struct Lisp_Vector *v = XVECTOR (DISP_INVIS_VECTOR (it->dp));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2503 it->dpvec = v->contents;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2504 it->dpend = v->contents + v->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2505 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2506 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2507 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2508 /* Default `...'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2509 it->dpvec = default_invis_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2510 it->dpend = default_invis_vector + 3;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2513 /* The ellipsis display does not replace the display of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2514 the character at the new position. Indicate this by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2515 setting IT->dpvec_char_len to zero. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2516 it->dpvec_char_len = 0;
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 it->current.dpvec_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2519 it->method = next_element_from_display_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2520 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2521 }
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 handled;
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
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2528
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2529 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2530 'display' property
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2531 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2532
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2533 /* Set up iterator IT from `display' property at its current position.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2534 Called from handle_stop. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2535
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2536 static enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2537 handle_display_prop (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2538 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2539 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2540 Lisp_Object prop, object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2541 struct text_pos *position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2542 int space_or_image_found_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2543
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2544 if (STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2545 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2546 object = it->string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2547 position = &it->current.string_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2548 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2549 else
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 object = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2552 position = &it->current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2553 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2554
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2555 /* Reset those iterator values set from display property values. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2556 it->font_height = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2557 it->space_width = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2558 it->voffset = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2559
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2560 /* We don't support recursive `display' properties, i.e. string
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2561 values that have a string `display' property, that have a string
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2562 `display' property etc. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2563 if (!it->string_from_display_prop_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2564 it->area = TEXT_AREA;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2565
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2566 prop = Fget_char_property (make_number (position->charpos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2567 Qdisplay, object);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2568 if (NILP (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2569 return HANDLED_NORMALLY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2570
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2571 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
2572 if (CONSP (prop)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2573 && CONSP (XCAR (prop))
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2574 && !EQ (Qmargin, XCAR (XCAR (prop))))
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2575 {
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2576 /* A list of sub-properties. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2577 while (CONSP (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2578 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2579 if (handle_single_display_prop (it, XCAR (prop), object, position))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2580 space_or_image_found_p = 1;
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 else if (VECTORP (prop))
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 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2587 for (i = 0; i < XVECTOR (prop)->size; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2588 if (handle_single_display_prop (it, XVECTOR (prop)->contents[i],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2589 object, position))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2590 space_or_image_found_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2591 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2592 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2593 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2594 if (handle_single_display_prop (it, prop, object, position))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2595 space_or_image_found_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2596 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2597
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2598 return space_or_image_found_p ? HANDLED_RETURN : HANDLED_NORMALLY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2599 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2600
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2601
25820
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2602 /* 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
2603 at START_POS in OBJECT. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2604
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2605 static struct text_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2606 display_prop_end (it, object, start_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2607 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2608 Lisp_Object object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2609 struct text_pos start_pos;
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 Lisp_Object end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2612 struct text_pos end_pos;
25820
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2613
30243
c56062542bae (display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents: 30216
diff changeset
2614 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
2615 Qdisplay, object, Qnil);
25820
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2616 CHARPOS (end_pos) = XFASTINT (end);
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2617 if (STRINGP (object))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2618 compute_string_pos (&end_pos, start_pos, it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2619 else
25820
a18595261196 (display_prop_end, invisible_text_between_p): Use
Gerd Moellmann <gerd@gnu.org>
parents: 25798
diff changeset
2620 BYTEPOS (end_pos) = CHAR_TO_BYTE (XFASTINT (end));
25012
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 return end_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2623 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2626 /* Set up IT from a single `display' sub-property value PROP. OBJECT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2627 is the object in which the `display' property was found. *POSITION
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2628 is the position at which it was found.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2629
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2630 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
2631 end position of the `display' property.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2632
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2633 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
2634
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2635 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2636 handle_single_display_prop (it, prop, object, position)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2637 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2638 Lisp_Object prop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2639 Lisp_Object object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2640 struct text_pos *position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2641 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2642 Lisp_Object value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2643 int space_or_image_found_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2644 Lisp_Object form;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2645
25614
766b6a577f15 (Qwhen): Replaces QCwhen.
Gerd Moellmann <gerd@gnu.org>
parents: 25598
diff changeset
2646 /* 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
2647 evaluated. If the result is nil, VALUE is ignored. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2648 form = Qt;
25614
766b6a577f15 (Qwhen): Replaces QCwhen.
Gerd Moellmann <gerd@gnu.org>
parents: 25598
diff changeset
2649 if (CONSP (prop) && EQ (XCAR (prop), Qwhen))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2650 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2651 prop = XCDR (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2652 if (!CONSP (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2653 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2654 form = XCAR (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2655 prop = XCDR (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2656 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2657
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2658 if (!NILP (form) && !EQ (form, Qt))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2659 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2660 struct gcpro gcpro1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2661 struct text_pos end_pos, pt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2662
28869
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2663 GCPRO1 (form);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2664 end_pos = display_prop_end (it, object, *position);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2665
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2666 /* Temporarily set point to the end position, and then evaluate
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2667 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
2668 if (BUFFERP (object))
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2669 {
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2670 CHARPOS (pt) = PT;
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2671 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
2672 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
2673 }
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2674
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
2675 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
2676
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2677 if (BUFFERP (object))
91b54118e73c (handle_single_display_prop): Don't try to set PT if
Gerd Moellmann <gerd@gnu.org>
parents: 28804
diff changeset
2678 TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2679 UNGCPRO;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2680 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2681
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2682 if (NILP (form))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2683 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2684
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2685 if (CONSP (prop)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2686 && EQ (XCAR (prop), Qheight)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2687 && CONSP (XCDR (prop)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2688 {
35444
753acaaa2840 (handle_single_display_prop): Remove references to
Andrew Innes <andrewi@gnu.org>
parents: 35412
diff changeset
2689 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2690 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2691
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2692 /* `(height HEIGHT)'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2693 it->font_height = XCAR (XCDR (prop));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2694 if (!NILP (it->font_height))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2695 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2696 struct face *face = FACE_FROM_ID (it->f, it->face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2697 int new_height = -1;
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 if (CONSP (it->font_height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2700 && (EQ (XCAR (it->font_height), Qplus)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2701 || EQ (XCAR (it->font_height), Qminus))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2702 && CONSP (XCDR (it->font_height))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2703 && INTEGERP (XCAR (XCDR (it->font_height))))
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 /* `(+ N)' or `(- N)' where N is an integer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2706 int steps = XINT (XCAR (XCDR (it->font_height)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2707 if (EQ (XCAR (it->font_height), Qplus))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2708 steps = - steps;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2709 it->face_id = smaller_face (it->f, it->face_id, steps);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2710 }
30216
394c884dc496 (eval_form): GCPRO argument sexpr.
Gerd Moellmann <gerd@gnu.org>
parents: 30202
diff changeset
2711 else if (FUNCTIONP (it->font_height))
25012
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 /* Call function with current height as argument.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2714 Value is the new height. */
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
2715 Lisp_Object height;
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
2716 height = safe_call1 (it->font_height,
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
2717 face->lface[LFACE_HEIGHT_INDEX]);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2718 if (NUMBERP (height))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2719 new_height = XFLOATINT (height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2720 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2721 else if (NUMBERP (it->font_height))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2722 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2723 /* Value is a multiple of the canonical char height. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2724 struct face *face;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2725
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2726 face = FACE_FROM_ID (it->f, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2727 new_height = (XFLOATINT (it->font_height)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2728 * XINT (face->lface[LFACE_HEIGHT_INDEX]));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2729 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2730 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2731 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2732 /* Evaluate IT->font_height with `height' bound to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2733 current specified height to get the new height. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2734 Lisp_Object value;
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
2735 int count = BINDING_STACK_SIZE ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2736
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2737 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
2738 value = safe_eval (it->font_height);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2739 unbind_to (count, Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2740
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2741 if (NUMBERP (value))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2742 new_height = XFLOATINT (value);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2743 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2744
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2745 if (new_height > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2746 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
2747 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2748 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2749 else if (CONSP (prop)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2750 && EQ (XCAR (prop), Qspace_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2751 && CONSP (XCDR (prop)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2752 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2753 /* `(space_width WIDTH)'. */
35444
753acaaa2840 (handle_single_display_prop): Remove references to
Andrew Innes <andrewi@gnu.org>
parents: 35412
diff changeset
2754 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
35017
53c3e3f3949b (try_window_reusing_current_matrix): Fix bug setting
Gerd Moellmann <gerd@gnu.org>
parents: 35005
diff changeset
2755 return 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2756
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2757 value = XCAR (XCDR (prop));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2758 if (NUMBERP (value) && XFLOATINT (value) > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2759 it->space_width = value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2760 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2761 else if (CONSP (prop)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2762 && EQ (XCAR (prop), Qraise)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2763 && CONSP (XCDR (prop)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2764 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2765 /* `(raise FACTOR)'. */
35444
753acaaa2840 (handle_single_display_prop): Remove references to
Andrew Innes <andrewi@gnu.org>
parents: 35412
diff changeset
2766 if (FRAME_TERMCAP_P (it->f) || FRAME_MSDOS_P (it->f))
35017
53c3e3f3949b (try_window_reusing_current_matrix): Fix bug setting
Gerd Moellmann <gerd@gnu.org>
parents: 35005
diff changeset
2767 return 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2768
27118
2efb49dc860b (handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
Eli Zaretskii <eliz@gnu.org>
parents: 27106
diff changeset
2769 #ifdef HAVE_WINDOW_SYSTEM
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2770 value = XCAR (XCDR (prop));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2771 if (NUMBERP (value))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2772 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2773 struct face *face = FACE_FROM_ID (it->f, it->face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2774 it->voffset = - (XFLOATINT (value)
27897
a6384a2b5574 (handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents: 27843
diff changeset
2775 * (FONT_HEIGHT (face->font)));
25012
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 #endif /* HAVE_WINDOW_SYSTEM */
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 else if (!it->string_from_display_prop_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2780 {
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2781 /* `((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
2782 VALUE) or `((margin nil) VALUE)' or VALUE. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2783 Lisp_Object location, value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2784 struct text_pos start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2785 int valid_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2786
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2787 /* Characters having this form of property are not displayed, so
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2788 we have to find the end of the property. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2789 start_pos = *position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2790 *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
2791 value = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2792
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2793 /* Let's stop at the new position and assume that all
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2794 text properties change there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2795 it->stop_charpos = position->charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2796
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2797 location = Qunbound;
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2798 if (CONSP (prop) && CONSP (XCAR (prop)))
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2799 {
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2800 Lisp_Object tem;
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2801
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2802 value = XCDR (prop);
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2803 if (CONSP (value))
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2804 value = XCAR (value);
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2805
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2806 tem = XCAR (prop);
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2807 if (EQ (XCAR (tem), Qmargin)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2808 && (tem = XCDR (tem),
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2809 tem = CONSP (tem) ? XCAR (tem) : Qnil,
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2810 (NILP (tem)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2811 || EQ (tem, Qleft_margin)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2812 || EQ (tem, Qright_margin))))
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2813 location = tem;
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2814 }
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2815
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
2816 if (EQ (location, Qunbound))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2817 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2818 location = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2819 value = prop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2820 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2821
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2822 #ifdef HAVE_WINDOW_SYSTEM
27118
2efb49dc860b (handle_single_display_prop) [HAVE_WINDOW_SYSTEM]: No
Eli Zaretskii <eliz@gnu.org>
parents: 27106
diff changeset
2823 if (FRAME_TERMCAP_P (it->f))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2824 valid_p = STRINGP (value);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2825 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2826 valid_p = (STRINGP (value)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2827 || (CONSP (value) && EQ (XCAR (value), Qspace))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2828 || valid_image_p (value));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2829 #else /* not HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2830 valid_p = STRINGP (value);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2831 #endif /* not HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2832
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2833 if ((EQ (location, Qleft_margin)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2834 || EQ (location, Qright_margin)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2835 || NILP (location))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2836 && valid_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2837 {
28804
ddc6811eb4c8 (handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents: 28754
diff changeset
2838 space_or_image_found_p = 1;
ddc6811eb4c8 (handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents: 28754
diff changeset
2839
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2840 /* Save current settings of IT so that we can restore them
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2841 when we are finished with the glyph property value. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2842 push_it (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2843
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2844 if (NILP (location))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2845 it->area = TEXT_AREA;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2846 else if (EQ (location, Qleft_margin))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2847 it->area = LEFT_MARGIN_AREA;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2848 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2849 it->area = RIGHT_MARGIN_AREA;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2850
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2851 if (STRINGP (value))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2852 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2853 it->string = value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2854 it->multibyte_p = STRING_MULTIBYTE (it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2855 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2856 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2857 it->end_charpos = it->string_nchars
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2858 = XSTRING (it->string)->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2859 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2860 it->stop_charpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2861 it->string_from_display_prop_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2862 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2863 else if (CONSP (value) && EQ (XCAR (value), Qspace))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2864 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2865 it->method = next_element_from_stretch;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2866 it->object = value;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2867 it->current.pos = it->position = start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2868 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2869 #ifdef HAVE_WINDOW_SYSTEM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2870 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2871 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2872 it->what = IT_IMAGE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2873 it->image_id = lookup_image (it->f, value);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2874 it->position = start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2875 it->object = NILP (object) ? it->w->buffer : object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2876 it->method = next_element_from_image;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2877
29185
239420a3c60d (Fdump_glyph_matrix): Declare the arg.
Dave Love <fx@gnu.org>
parents: 29023
diff changeset
2878 /* Say that we haven't consumed the characters with
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2879 `display' property yet. The call to pop_it in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2880 set_iterator_to_next will clean this up. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2881 *position = start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2882 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2883 #endif /* HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2884 }
28804
ddc6811eb4c8 (handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents: 28754
diff changeset
2885 else
ddc6811eb4c8 (handle_single_display_prop): If display property value
Gerd Moellmann <gerd@gnu.org>
parents: 28754
diff changeset
2886 /* 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
2887 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
2888 *position = start_pos;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2889 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2890
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2891 return space_or_image_found_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2892 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2893
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
2894
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2895 /* 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
2896 treated as intangible. */
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2897
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2898 static int
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2899 single_display_prop_intangible_p (prop)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2900 Lisp_Object prop;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2901 {
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2902 /* Skip over `when FORM'. */
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2903 if (CONSP (prop) && EQ (XCAR (prop), Qwhen))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2904 {
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2905 prop = XCDR (prop);
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2906 if (!CONSP (prop))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2907 return 0;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2908 prop = XCDR (prop);
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2909 }
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2910
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2911 if (!CONSP (prop))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2912 return 0;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2913
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2914 /* 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
2915 we don't need to treat text as intangible. */
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2916 if (EQ (XCAR (prop), Qmargin))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2917 {
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2918 prop = XCDR (prop);
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2919 if (!CONSP (prop))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2920 return 0;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2921
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2922 prop = XCDR (prop);
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2923 if (!CONSP (prop)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2924 || EQ (XCAR (prop), Qleft_margin)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2925 || EQ (XCAR (prop), Qright_margin))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2926 return 0;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2927 }
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2928
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2929 return CONSP (prop) && EQ (XCAR (prop), Qimage);
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2930 }
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2931
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2932
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2933 /* 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
2934 treated as intangible. */
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2935
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2936 int
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2937 display_prop_intangible_p (prop)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2938 Lisp_Object prop;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2939 {
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2940 if (CONSP (prop)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2941 && CONSP (XCAR (prop))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2942 && !EQ (Qmargin, XCAR (XCAR (prop))))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2943 {
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2944 /* A list of sub-properties. */
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2945 while (CONSP (prop))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2946 {
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2947 if (single_display_prop_intangible_p (XCAR (prop)))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2948 return 1;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2949 prop = XCDR (prop);
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2950 }
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2951 }
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2952 else if (VECTORP (prop))
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2953 {
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2954 /* A vector of sub-properties. */
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2955 int i;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2956 for (i = 0; i < XVECTOR (prop)->size; ++i)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2957 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
2958 return 1;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2959 }
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2960 else
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2961 return single_display_prop_intangible_p (prop);
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2962
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2963 return 0;
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2964 }
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
2965
25012
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 /***********************************************************************
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2968 `composition' property
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2969 ***********************************************************************/
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2970
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2971 /* 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
2972 position. Called from handle_stop. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2973
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2974 static enum prop_handled
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2975 handle_composition_prop (it)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2976 struct it *it;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2977 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2978 Lisp_Object prop, string;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2979 int pos, pos_byte, end;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2980 enum prop_handled handled = HANDLED_NORMALLY;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2981
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2982 if (STRINGP (it->string))
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2983 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2984 pos = IT_STRING_CHARPOS (*it);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2985 pos_byte = IT_STRING_BYTEPOS (*it);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2986 string = it->string;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2987 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2988 else
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2989 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2990 pos = IT_CHARPOS (*it);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2991 pos_byte = IT_BYTEPOS (*it);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2992 string = Qnil;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2993 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2994
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
2995 /* 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
2996 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
2997 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
2998 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
2999 && COMPOSITION_VALID_P (pos, end, prop)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3000 && (STRINGP (it->string) || (PT <= pos || PT >= end)))
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3001 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3002 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
3003
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3004 if (id >= 0)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3005 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3006 it->method = next_element_from_composition;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3007 it->cmp_id = id;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3008 it->cmp_len = COMPOSITION_LENGTH (prop);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3009 /* 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
3010 components. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3011 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
3012 it->len = (STRINGP (it->string)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3013 ? string_char_to_byte (it->string, end)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3014 : CHAR_TO_BYTE (end)) - pos_byte;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3015 it->stop_charpos = end;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3016 handled = HANDLED_RETURN;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3017 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3018 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3019
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3020 return handled;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3021 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3022
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3023
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3024
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3025 /***********************************************************************
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3026 Overlay strings
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3027 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3028
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3029 /* The following structure is used to record overlay strings for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3030 later sorting in load_overlay_strings. */
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 struct overlay_entry
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3033 {
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3034 Lisp_Object overlay;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3035 Lisp_Object string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3036 int priority;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3037 int after_string_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3038 };
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3039
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3040
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3041 /* Set up iterator IT from overlay strings at its current position.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3042 Called from handle_stop. */
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 static enum prop_handled
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3045 handle_overlay_change (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3046 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3047 {
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3048 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
3049 return HANDLED_RECOMPUTE_PROPS;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3050 else
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3051 return HANDLED_NORMALLY;
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3054
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3055 /* 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
3056 overlay string to deliver. Called by set_iterator_to_next when the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3057 end of the current overlay string is reached. If there are more
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3058 overlay strings to display, IT->string and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3059 IT->current.overlay_string_index are set appropriately here.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3060 Otherwise IT->string is set to nil. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3061
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3062 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3063 next_overlay_string (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3064 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3065 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3066 ++it->current.overlay_string_index;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3067 if (it->current.overlay_string_index == it->n_overlay_strings)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3068 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3069 /* No more overlay strings. Restore IT's settings to what
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3070 they were before overlay strings were processed, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3071 continue to deliver from current_buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3072 pop_it (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3073 xassert (it->stop_charpos >= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3074 && it->stop_charpos <= it->end_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3075 it->string = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3076 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3077 SET_TEXT_POS (it->current.string_pos, -1, -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3078 it->n_overlay_strings = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3079 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
3080
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3081 /* 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
3082 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
3083 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
3084 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
3085 it->overlay_strings_at_end_processed_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3086 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3087 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3088 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3089 /* There are more overlay strings to process. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3090 IT->current.overlay_string_index has advanced to a position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3091 where we must load IT->overlay_strings with more strings, do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3092 it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3093 int i = it->current.overlay_string_index % OVERLAY_STRING_CHUNK_SIZE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3094
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3095 if (it->current.overlay_string_index && i == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3096 load_overlay_strings (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3097
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3098 /* Initialize IT to deliver display elements from the overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3099 string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3100 it->string = it->overlay_strings[i];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3101 it->multibyte_p = STRING_MULTIBYTE (it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3102 SET_TEXT_POS (it->current.string_pos, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3103 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3104 it->stop_charpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3105 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3106
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3107 CHECK_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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3110
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3111 /* Compare two overlay_entry structures E1 and E2. Used as a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3112 comparison function for qsort in load_overlay_strings. Overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3113 strings for the same position are sorted so that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3114
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3115 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
3116 when they come from the same overlay.
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 2. Within after-strings, strings are sorted so that overlay strings
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3119 from overlays with higher priorities come first.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3120
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3121 2. Within before-strings, strings are sorted so that overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3122 strings from overlays with higher priorities come last.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3123
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3124 Value is analogous to strcmp. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3125
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 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3128 compare_overlay_entries (e1, e2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3129 void *e1, *e2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3130 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3131 struct overlay_entry *entry1 = (struct overlay_entry *) e1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3132 struct overlay_entry *entry2 = (struct overlay_entry *) e2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3133 int result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3134
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3135 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
3136 {
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3137 /* 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
3138 they come from different overlays. */
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3139 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
3140 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
3141 else
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3142 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
3143 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3144 else if (entry1->after_string_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3145 /* After-strings sorted in order of decreasing priority. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3146 result = entry2->priority - entry1->priority;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3147 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3148 /* Before-strings sorted in order of increasing priority. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3149 result = entry1->priority - entry2->priority;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3150
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3151 return result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3152 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3153
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3154
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3155 /* Load the vector IT->overlay_strings with overlay strings from IT's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3156 current buffer position. Set IT->n_overlays to the total number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3157 overlay strings found.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3158
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3159 Overlay strings are processed OVERLAY_STRING_CHUNK_SIZE strings at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3160 a time. On entry into load_overlay_strings,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3161 IT->current.overlay_string_index gives the number of overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3162 strings that have already been loaded by previous calls to this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3163 function.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3164
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3165 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
3166 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
3167 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
3168 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
3169 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
3170 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
3171 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
3172 in this case.
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3173
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3174 Overlay strings are sorted so that after-string strings come in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3175 front of before-string strings. Within before and after-strings,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3176 strings are sorted by overlay priority. See also function
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3177 compare_overlay_entries. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3178
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3179 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3180 load_overlay_strings (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3181 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3182 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3183 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
3184 Lisp_Object ov, overlay, window, str, invisible;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3185 int start, end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3186 int size = 20;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3187 int n = 0, i, j, invis_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3188 struct overlay_entry *entries
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3189 = (struct overlay_entry *) alloca (size * sizeof *entries);
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3190 int charpos = IT_CHARPOS (*it);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3191
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3192 /* Append the overlay string STRING of overlay OVERLAY to vector
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3193 `entries' which has size `size' and currently contains `n'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3194 elements. AFTER_P non-zero means STRING is an after-string of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3195 OVERLAY. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3196 #define RECORD_OVERLAY_STRING(OVERLAY, STRING, AFTER_P) \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3197 do \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3198 { \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3199 Lisp_Object priority; \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3200 \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3201 if (n == size) \
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 int new_size = 2 * size; \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3204 struct overlay_entry *old = entries; \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3205 entries = \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3206 (struct overlay_entry *) alloca (new_size \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3207 * sizeof *entries); \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3208 bcopy (old, entries, size * sizeof *entries); \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3209 size = new_size; \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3210 } \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3211 \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3212 entries[n].string = (STRING); \
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3213 entries[n].overlay = (OVERLAY); \
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3214 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
3215 entries[n].priority = INTEGERP (priority) ? XINT (priority) : 0; \
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3216 entries[n].after_string_p = (AFTER_P); \
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3217 ++n; \
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 while (0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3220
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3221 /* 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
3222 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
3223 {
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
3224 overlay = XCAR (ov);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3225 xassert (OVERLAYP (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3226 start = OVERLAY_POSITION (OVERLAY_START (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3227 end = OVERLAY_POSITION (OVERLAY_END (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3228
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3229 if (end < charpos)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3230 break;
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 /* 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
3233 position. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3234 if (end != charpos && start != charpos)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3235 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3236
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3237 /* Skip this overlay if it doesn't apply to IT->w. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3238 window = Foverlay_get (overlay, Qwindow);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3239 if (WINDOWP (window) && XWINDOW (window) != it->w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3240 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3241
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3242 /* 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
3243 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
3244 end position are indistinguishable. */
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3245 invisible = Foverlay_get (overlay, Qinvisible);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3246 invis_p = TEXT_PROP_MEANS_INVISIBLE (invisible);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3247
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3248 /* 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
3249 if ((start == charpos || (end == charpos && invis_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3250 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3251 && XSTRING (str)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3252 RECORD_OVERLAY_STRING (overlay, str, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3253
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3254 /* 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
3255 if ((end == charpos || (start == charpos && invis_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3256 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3257 && XSTRING (str)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3258 RECORD_OVERLAY_STRING (overlay, str, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3259 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3260
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3261 /* 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
3262 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
3263 {
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
3264 overlay = XCAR (ov);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3265 xassert (OVERLAYP (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3266 start = OVERLAY_POSITION (OVERLAY_START (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3267 end = OVERLAY_POSITION (OVERLAY_END (overlay));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3268
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3269 if (start > charpos)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3270 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3271
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3272 /* 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
3273 position. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3274 if (end != charpos && start != charpos)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3275 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3276
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3277 /* Skip this overlay if it doesn't apply to IT->w. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3278 window = Foverlay_get (overlay, Qwindow);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3279 if (WINDOWP (window) && XWINDOW (window) != it->w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3280 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3281
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3282 /* 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
3283 dimension, and both before- and after-strings apply. */
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3284 invisible = Foverlay_get (overlay, Qinvisible);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3285 invis_p = TEXT_PROP_MEANS_INVISIBLE (invisible);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3286
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3287 /* 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
3288 if ((start == charpos || (end == charpos && invis_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3289 && (str = Foverlay_get (overlay, Qbefore_string), STRINGP (str))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3290 && XSTRING (str)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3291 RECORD_OVERLAY_STRING (overlay, str, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3292
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3293 /* 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
3294 if ((end == charpos || (start == charpos && invis_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3295 && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3296 && XSTRING (str)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3297 RECORD_OVERLAY_STRING (overlay, str, 1);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3300 #undef RECORD_OVERLAY_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 /* Sort entries. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3303 if (n > 1)
29858
54f927c5f436 (handle_stop): Initialize it->add_overlay_start to zero.
Gerd Moellmann <gerd@gnu.org>
parents: 29817
diff changeset
3304 qsort (entries, n, sizeof *entries, compare_overlay_entries);
25012
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 /* Record the total number of strings to process. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3307 it->n_overlay_strings = n;
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 /* IT->current.overlay_string_index is the number of overlay strings
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3310 that have already been consumed by IT. Copy some of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3311 remaining overlay strings to IT->overlay_strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3312 i = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3313 j = it->current.overlay_string_index;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3314 while (i < OVERLAY_STRING_CHUNK_SIZE && j < n)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3315 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
3316
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3317 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3318 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3321 /* Get the first chunk of overlay strings at IT's current buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3322 position. Value is non-zero if at least one overlay string was
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3323 found. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3324
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3325 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3326 get_overlay_strings (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3327 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3328 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3329 /* Get the first OVERLAY_STRING_CHUNK_SIZE overlay strings to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3330 process. This fills IT->overlay_strings with strings, and sets
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3331 IT->n_overlay_strings to the total number of strings to process.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3332 IT->pos.overlay_string_index has to be set temporarily to zero
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3333 because load_overlay_strings needs this; it must be set to -1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3334 when no overlay strings are found because a zero value would
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3335 indicate a position in the first overlay string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3336 it->current.overlay_string_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3337 load_overlay_strings (it);
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 /* If we found overlay strings, set up IT to deliver display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3340 elements from the first one. Otherwise set up IT to deliver
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3341 from current_buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3342 if (it->n_overlay_strings)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3343 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3344 /* Make sure we know settings in current_buffer, so that we can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3345 restore meaningful values when we're done with the overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3346 strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3347 compute_stop_pos (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3348 xassert (it->face_id >= 0);
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 /* Save IT's settings. They are restored after all overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3351 strings have been processed. */
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 push_it (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3354
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3355 /* Set up IT to deliver display elements from the first overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3356 string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3357 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3358 it->stop_charpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3359 it->string = it->overlay_strings[0];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3360 it->multibyte_p = STRING_MULTIBYTE (it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3361 xassert (STRINGP (it->string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3362 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3363 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3364 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3365 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3366 it->string = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3367 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3368 it->method = next_element_from_buffer;
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 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3372
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3373 /* Value is non-zero if we found at least one overlay string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3374 return STRINGP (it->string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3375 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3378
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3379 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3380 Saving and restoring state
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3381 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3382
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3383 /* Save current settings of IT on IT->stack. Called, for example,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3384 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
3385 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
3386 processed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3387
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3388 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3389 push_it (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3390 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3391 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3392 struct iterator_stack_entry *p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3393
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3394 xassert (it->sp < 2);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3395 p = it->stack + it->sp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3396
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3397 p->stop_charpos = it->stop_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3398 xassert (it->face_id >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3399 p->face_id = it->face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3400 p->string = it->string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3401 p->pos = it->current;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3402 p->end_charpos = it->end_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3403 p->string_nchars = it->string_nchars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3404 p->area = it->area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3405 p->multibyte_p = it->multibyte_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3406 p->space_width = it->space_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3407 p->font_height = it->font_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3408 p->voffset = it->voffset;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3409 p->string_from_display_prop_p = it->string_from_display_prop_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3410 ++it->sp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3411 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3412
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3413
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3414 /* Restore IT's settings from IT->stack. Called, for example, when no
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3415 more overlay strings must be processed, and we return to delivering
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3416 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
3417 `display' property is reached and we return to delivering display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3418 elements from an overlay string, or from a buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3419
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3420 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3421 pop_it (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3422 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3423 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3424 struct iterator_stack_entry *p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3425
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3426 xassert (it->sp > 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3427 --it->sp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3428 p = it->stack + it->sp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3429 it->stop_charpos = p->stop_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3430 it->face_id = p->face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3431 it->string = p->string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3432 it->current = p->pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3433 it->end_charpos = p->end_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3434 it->string_nchars = p->string_nchars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3435 it->area = p->area;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3436 it->multibyte_p = p->multibyte_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3437 it->space_width = p->space_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3438 it->font_height = p->font_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3439 it->voffset = p->voffset;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3440 it->string_from_display_prop_p = p->string_from_display_prop_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3441 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3442
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3443
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3444
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3445 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3446 Moving over lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3447 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3448
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3449 /* Set IT's current position to the previous line start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3450
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3451 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3452 back_to_previous_line_start (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3453 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3454 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3455 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
3456 IT_BYTEPOS (*it) = CHAR_TO_BYTE (IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3457 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3458
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3459
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3460 /* Move IT to the next line start.
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3461
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3462 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
3463 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
3464 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
3465 of *SKIPPED_P.
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3466
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3467 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
3468 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
3469 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
3470
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3471 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
3472 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
3473 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
3474 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
3475 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
3476 leads to wrong cursor motion. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3477
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3478 static int
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3479 forward_to_next_line_start (it, skipped_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3480 struct it *it;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3481 int *skipped_p;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3482 {
32585
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
3483 int old_selective, newline_found_p, n;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3484 const int MAX_NEWLINE_DISTANCE = 500;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3485
33916
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3486 /* 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
3487 skipping over invisible text below. */
33950
a036721cfe80 (forward_to_next_line_start): Check for newlines,
Gerd Moellmann <gerd@gnu.org>
parents: 33916
diff changeset
3488 if (it->what == IT_CHARACTER && it->c == '\n')
33916
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3489 {
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3490 set_iterator_to_next (it, 0);
35029
e02de3bdd349 (forward_to_next_line_start): Reset it->c if taking the
Gerd Moellmann <gerd@gnu.org>
parents: 35023
diff changeset
3491 it->c = 0;
33916
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3492 return 1;
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3493 }
907c3073ae28 (forward_to_next_line_start): If already on a newline,
Gerd Moellmann <gerd@gnu.org>
parents: 33898
diff changeset
3494
32585
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
3495 /* 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
3496 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
3497 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
3498 calls this function. */
32585
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
3499 old_selective = it->selective;
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
3500 it->selective = 0;
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
3501
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3502 /* 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
3503 from buffer text. */
35379
4bdad7b6d6dc (forward_to_next_line_start): Avoid calling
Gerd Moellmann <gerd@gnu.org>
parents: 35361
diff changeset
3504 for (n = newline_found_p = 0;
4bdad7b6d6dc (forward_to_next_line_start): Avoid calling
Gerd Moellmann <gerd@gnu.org>
parents: 35361
diff changeset
3505 !newline_found_p && n < MAX_NEWLINE_DISTANCE;
4bdad7b6d6dc (forward_to_next_line_start): Avoid calling
Gerd Moellmann <gerd@gnu.org>
parents: 35361
diff changeset
3506 n += STRINGP (it->string) ? 0 : 1)
4bdad7b6d6dc (forward_to_next_line_start): Avoid calling
Gerd Moellmann <gerd@gnu.org>
parents: 35361
diff changeset
3507 {
35389
6fa1f816cb97 (forward_to_next_line_start): Stop at end of buffer
Gerd Moellmann <gerd@gnu.org>
parents: 35388
diff changeset
3508 if (!get_next_display_element (it))
6fa1f816cb97 (forward_to_next_line_start): Stop at end of buffer
Gerd Moellmann <gerd@gnu.org>
parents: 35388
diff changeset
3509 break;
33950
a036721cfe80 (forward_to_next_line_start): Check for newlines,
Gerd Moellmann <gerd@gnu.org>
parents: 33916
diff changeset
3510 newline_found_p = it->what == IT_CHARACTER && it->c == '\n';
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3511 set_iterator_to_next (it, 0);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3512 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3513
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3514 /* 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
3515 short-cut. */
35379
4bdad7b6d6dc (forward_to_next_line_start): Avoid calling
Gerd Moellmann <gerd@gnu.org>
parents: 35361
diff changeset
3516 if (n == MAX_NEWLINE_DISTANCE)
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3517 {
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3518 int start = IT_CHARPOS (*it);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3519 int limit = find_next_newline_no_quit (start, 1);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3520 Lisp_Object pos;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3521
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3522 xassert (!STRINGP (it->string));
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3523
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3524 /* 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
3525 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
3526 buffer text. */
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3527 if (it->stop_charpos >= limit
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3528 || ((pos = Fnext_single_property_change (make_number (start),
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3529 Qdisplay,
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3530 Qnil, make_number (limit)),
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3531 NILP (pos))
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3532 && next_overlay_change (start) == ZV))
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3533 {
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3534 IT_CHARPOS (*it) = limit;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3535 IT_BYTEPOS (*it) = CHAR_TO_BYTE (limit);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3536 *skipped_p = newline_found_p = 1;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3537 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3538 else
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3539 {
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3540 while (get_next_display_element (it)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3541 && !newline_found_p)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3542 {
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3543 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
3544 set_iterator_to_next (it, 0);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3545 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3546 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3547 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3548
32585
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
3549 it->selective = old_selective;
35029
e02de3bdd349 (forward_to_next_line_start): Reset it->c if taking the
Gerd Moellmann <gerd@gnu.org>
parents: 35023
diff changeset
3550 xassert (!newline_found_p || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n');
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3551 return newline_found_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3552 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3553
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3554
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3555 /* Set IT's current position to the previous visible line start. Skip
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3556 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
3557 selective display. Caution: this does not change IT->current_x and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3558 IT->hpos. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3559
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3560 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3561 back_to_previous_visible_line_start (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3562 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3563 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3564 int visible_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3565
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3566 /* Go back one newline if not on BEGV already. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3567 if (IT_CHARPOS (*it) > BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3568 back_to_previous_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3569
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3570 /* Move over lines that are invisible because of selective display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3571 or text properties. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3572 while (IT_CHARPOS (*it) > BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3573 && !visible_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3574 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3575 visible_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3576
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3577 /* If selective > 0, then lines indented more than that values
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3578 are invisible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3579 if (it->selective > 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3580 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3581 it->selective))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3582 visible_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3583 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3584 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3585 Lisp_Object prop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3586
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
3587 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
3588 Qinvisible, it->window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3589 if (TEXT_PROP_MEANS_INVISIBLE (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3590 visible_p = 0;
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 /* Back one more newline if the current one is invisible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3594 if (!visible_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3595 back_to_previous_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3596 }
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 xassert (IT_CHARPOS (*it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3599 xassert (IT_CHARPOS (*it) == BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3600 || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3601 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3602 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3605 /* Reseat iterator IT at the previous visible line start. Skip
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3606 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
3607 selective display. At the end, update IT's overlay information,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3608 face information etc. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3611 reseat_at_previous_visible_line_start (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3612 struct it *it;
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 back_to_previous_visible_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3615 reseat (it, it->current.pos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3616 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3617 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3618
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3619
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3620 /* 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
3621 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
3622 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
3623 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
3624 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
3625 is invisible because of text properties. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3626
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3627 static void
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3628 reseat_at_next_visible_line_start (it, on_newline_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3629 struct it *it;
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3630 int on_newline_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3631 {
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3632 int newline_found_p, skipped_p = 0;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3633
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3634 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
3635
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3636 /* 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
3637 more than the value of IT->selective. */
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3638 if (it->selective > 0)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3639 while (IT_CHARPOS (*it) < ZV
35029
e02de3bdd349 (forward_to_next_line_start): Reset it->c if taking the
Gerd Moellmann <gerd@gnu.org>
parents: 35023
diff changeset
3640 && indented_beyond_p (IT_CHARPOS (*it), IT_BYTEPOS (*it),
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3641 it->selective))
35029
e02de3bdd349 (forward_to_next_line_start): Reset it->c if taking the
Gerd Moellmann <gerd@gnu.org>
parents: 35023
diff changeset
3642 {
e02de3bdd349 (forward_to_next_line_start): Reset it->c if taking the
Gerd Moellmann <gerd@gnu.org>
parents: 35023
diff changeset
3643 xassert (FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n');
e02de3bdd349 (forward_to_next_line_start): Reset it->c if taking the
Gerd Moellmann <gerd@gnu.org>
parents: 35023
diff changeset
3644 newline_found_p = forward_to_next_line_start (it, &skipped_p);
e02de3bdd349 (forward_to_next_line_start): Reset it->c if taking the
Gerd Moellmann <gerd@gnu.org>
parents: 35023
diff changeset
3645 }
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3646
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3647 /* 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
3648 if (on_newline_p && newline_found_p)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3649 {
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3650 if (STRINGP (it->string))
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3651 {
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3652 if (IT_STRING_CHARPOS (*it) > 0)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3653 {
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3654 --IT_STRING_CHARPOS (*it);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3655 --IT_STRING_BYTEPOS (*it);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3656 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3657 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3658 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
3659 {
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
3660 --IT_CHARPOS (*it);
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3661 --IT_BYTEPOS (*it);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3662 reseat (it, it->current.pos, 0);
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3663 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3664 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3665 else if (skipped_p)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
3666 reseat (it, it->current.pos, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3667
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3668 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3669 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3672
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 Changing an iterator's position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3675 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3676
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3677 /* 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
3678 is non-zero, always check for text properties at the new position.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3679 Otherwise, text properties are only looked up if POS >=
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3680 IT->check_charpos of a property. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3683 reseat (it, pos, force_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3684 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3685 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3686 int force_p;
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 int original_pos = IT_CHARPOS (*it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3689
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3690 reseat_1 (it, pos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3691
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3692 /* Determine where to check text properties. Avoid doing it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3693 where possible because text property lookup is very expensive. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3694 if (force_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3695 || CHARPOS (pos) > it->stop_charpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3696 || CHARPOS (pos) < original_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3697 handle_stop (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3698
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3699 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3700 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3701
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3702
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3703 /* 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
3704 IT->stop_pos to POS, also. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3705
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3706 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3707 reseat_1 (it, pos, set_stop_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3708 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3709 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3710 int set_stop_p;
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 /* Don't call this function when scanning a C string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3713 xassert (it->s == NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3714
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3715 /* POS must be a reasonable value. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3716 xassert (CHARPOS (pos) >= BEGV && CHARPOS (pos) <= ZV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3717
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3718 it->current.pos = it->position = pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3719 XSETBUFFER (it->object, current_buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3720 it->dpvec = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3721 it->current.dpvec_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3722 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3723 IT_STRING_CHARPOS (*it) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3724 IT_STRING_BYTEPOS (*it) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3725 it->string = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3726 it->method = next_element_from_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3727 it->sp = 0;
34225
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
3728 it->face_before_selective_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3729
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3730 if (set_stop_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3731 it->stop_charpos = CHARPOS (pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3732 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3735 /* 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
3736 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
3737 STRING gives a Lisp string to iterate over.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3738
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3739 If PRECISION > 0, don't return more then PRECISION number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3740 characters from the string.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3741
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3742 If FIELD_WIDTH > 0, return padding spaces until FIELD_WIDTH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3743 characters have been returned. FIELD_WIDTH < 0 means an infinite
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3744 field width.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3745
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3746 MULTIBYTE = 0 means disable processing of multibyte characters,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3747 MULTIBYTE > 0 means enable it,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3748 MULTIBYTE < 0 means use IT->multibyte_p.
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 IT must be initialized via a prior call to init_iterator before
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3751 calling this function. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3754 reseat_to_string (it, s, string, charpos, precision, field_width, multibyte)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3755 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3756 unsigned char *s;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3757 Lisp_Object string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3758 int charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3759 int precision, field_width, multibyte;
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 /* No region in strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3762 it->region_beg_charpos = it->region_end_charpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3763
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3764 /* No text property checks performed by default, but see below. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3765 it->stop_charpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3766
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3767 /* Set iterator position and end position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3768 bzero (&it->current, sizeof it->current);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3769 it->current.overlay_string_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3770 it->current.dpvec_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3771 xassert (charpos >= 0);
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 /* Use the setting of MULTIBYTE if specified. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3774 if (multibyte >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3775 it->multibyte_p = multibyte > 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3776
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3777 if (s == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3778 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3779 xassert (STRINGP (string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3780 it->string = string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3781 it->s = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3782 it->end_charpos = it->string_nchars = XSTRING (string)->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3783 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3784 it->current.string_pos = string_pos (charpos, string);
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3787 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3788 it->s = s;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3789 it->string = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3790
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3791 /* Note that we use IT->current.pos, not it->current.string_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3792 for displaying C strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3793 IT_STRING_CHARPOS (*it) = IT_STRING_BYTEPOS (*it) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3794 if (it->multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3795 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3796 it->current.pos = c_string_pos (charpos, s, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3797 it->end_charpos = it->string_nchars = number_of_chars (s, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3798 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3799 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3800 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3801 IT_CHARPOS (*it) = IT_BYTEPOS (*it) = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3802 it->end_charpos = it->string_nchars = strlen (s);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3805 it->method = next_element_from_c_string;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3808 /* PRECISION > 0 means don't return more than PRECISION characters
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3809 from the string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3810 if (precision > 0 && it->end_charpos - charpos > precision)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3811 it->end_charpos = it->string_nchars = charpos + precision;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3812
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3813 /* FIELD_WIDTH > 0 means pad with spaces until FIELD_WIDTH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3814 characters have been returned. FIELD_WIDTH == 0 means don't pad,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3815 FIELD_WIDTH < 0 means infinite field width. This is useful for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3816 padding with `-' at the end of a mode line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3817 if (field_width < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3818 field_width = INFINITY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3819 if (field_width > it->end_charpos - charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3820 it->end_charpos = charpos + field_width;
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 /* Use the standard display table for displaying strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3823 if (DISP_TABLE_P (Vstandard_display_table))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3824 it->dp = XCHAR_TABLE (Vstandard_display_table);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3825
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3826 it->stop_charpos = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3827 CHECK_IT (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3828 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3829
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3830
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3831
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3832 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3833 Iteration
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3834 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3835
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3836 /* Load IT's display element fields with information about the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3837 display element from the current position of IT. Value is zero if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3838 end of buffer (or C string) is reached. */
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 int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3841 get_next_display_element (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3842 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3843 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3844 /* Non-zero means that we found an display element. Zero means that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3845 we hit the end of what we iterate over. Performance note: the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3846 function pointer `method' used here turns out to be faster than
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3847 using a sequence of if-statements. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3848 int success_p = (*it->method) (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3849
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3850 if (it->what == IT_CHARACTER)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3851 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3852 /* Map via display table or translate control characters.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3853 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
3854 the function call above. If we have a display table, and it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3855 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
3856 IT->c itself comes from a display table, otherwise we could
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3857 end up in an infinite recursion. (An alternative could be to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3858 count the recursion depth of this function and signal an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3859 error when a certain maximum depth is reached.) Is it worth
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3860 it? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3861 if (success_p && it->dpvec == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3862 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3863 Lisp_Object dv;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3864
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3865 if (it->dp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3866 && (dv = DISP_CHAR_VECTOR (it->dp, it->c),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3867 VECTORP (dv)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3868 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3869 struct Lisp_Vector *v = XVECTOR (dv);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3870
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3871 /* Return the first character from the display table
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3872 entry, if not empty. If empty, don't display the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3873 current character. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3874 if (v->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3875 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3876 it->dpvec_char_len = it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3877 it->dpvec = v->contents;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3878 it->dpend = v->contents + v->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3879 it->current.dpvec_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3880 it->method = next_element_from_display_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3881 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3882
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3883 success_p = get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3884 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3885
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3886 /* Translate control characters into `\003' or `^C' form.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3887 Control characters coming from a display table entry are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3888 currently not translated because we use IT->dpvec to hold
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3889 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
3890 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
3891
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3892 Non-printable multibyte characters are also translated
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3893 octal form. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3894 else if ((it->c < ' '
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3895 && (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
3896 || (it->c != '\n' && it->c != '\t')))
25063
7c69e1001e35 (get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents: 25012
diff changeset
3897 || (it->c >= 127
25500
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3898 && it->len == 1)
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3899 || !CHAR_PRINTABLE_P (it->c))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3900 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3901 /* IT->c is a control character which must be displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3902 either as '\003' or as `^C' where the '\\' and '^'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3903 can be defined in the display table. Fill
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3904 IT->ctl_chars with glyphs for what we have to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3905 display. Then, set IT->dpvec to these glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3906 GLYPH g;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3907
25063
7c69e1001e35 (get_next_display_element): Display DEL as `^?'.
Gerd Moellmann <gerd@gnu.org>
parents: 25012
diff changeset
3908 if (it->c < 128 && it->ctl_arrow_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3909 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3910 /* Set IT->ctl_chars[0] to the glyph for `^'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3911 if (it->dp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3912 && INTEGERP (DISP_CTRL_GLYPH (it->dp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3913 && GLYPH_CHAR_VALID_P (XINT (DISP_CTRL_GLYPH (it->dp))))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3914 g = XINT (DISP_CTRL_GLYPH (it->dp));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3915 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3916 g = FAST_MAKE_GLYPH ('^', 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3917 XSETINT (it->ctl_chars[0], g);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3918
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3919 g = FAST_MAKE_GLYPH (it->c ^ 0100, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3920 XSETINT (it->ctl_chars[1], g);
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 /* Set up IT->dpvec and return first character from it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3923 it->dpvec_char_len = it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3924 it->dpvec = it->ctl_chars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3925 it->dpend = it->dpvec + 2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3926 it->current.dpvec_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3927 it->method = next_element_from_display_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3928 get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3929 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3930 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3931 {
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
3932 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
3933 int len;
25500
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3934 int i;
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3935 GLYPH escape_glyph;
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3936
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3937 /* Set IT->ctl_chars[0] to the glyph for `\\'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3938 if (it->dp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3939 && INTEGERP (DISP_ESCAPE_GLYPH (it->dp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3940 && 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
3941 escape_glyph = XFASTINT (DISP_ESCAPE_GLYPH (it->dp));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3942 else
25500
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3943 escape_glyph = FAST_MAKE_GLYPH ('\\', 0);
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3944
29023
af50e87cc257 (get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents: 28984
diff changeset
3945 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
3946 str[0] = it->c, len = 1;
af50e87cc257 (get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents: 28984
diff changeset
3947 else
af50e87cc257 (get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents: 28984
diff changeset
3948 len = CHAR_STRING (it->c, str);
af50e87cc257 (get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents: 28984
diff changeset
3949
25500
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3950 for (i = 0; i < len; i++)
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3951 {
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3952 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
3953 /* 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
3954 the octal display of the character. */
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3955 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
3956 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
3957 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
3958 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
3959 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
3960 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
3961 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3962
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3963 /* Set up IT->dpvec and return the first character
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3964 from it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3965 it->dpvec_char_len = it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3966 it->dpvec = it->ctl_chars;
25500
156172362ea9 (get_next_display_element): Display incomplete multibyte
Kenichi Handa <handa@m17n.org>
parents: 25493
diff changeset
3967 it->dpend = it->dpvec + len * 4;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3968 it->current.dpvec_index = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3969 it->method = next_element_from_display_vector;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3970 get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3971 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3972 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3973 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3974
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
3975 /* 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
3976 multibyte character in unibyte text. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3977 if (it->multibyte_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3978 && success_p
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
3979 && FRAME_WINDOW_P (it->f))
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
3980 {
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
3981 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
3982 it->face_id = FACE_FOR_CHAR (it->f, face, it->c);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3983 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3984 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3985
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3986 /* Is this character the last one of a run of characters with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3987 box? If yes, set IT->end_of_box_run_p to 1. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3988 if (it->face_box_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3989 && it->s == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3990 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3991 int face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3992 struct face *face;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3993
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3994 it->end_of_box_run_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3995 = ((face_id = face_after_it_pos (it),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3996 face_id != it->face_id)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3997 && (face = FACE_FROM_ID (it->f, face_id),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3998 face->box == FACE_NO_BOX));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
3999 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4000
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4001 /* Value is 0 if end of buffer or string reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4002 return success_p;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4005
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4006 /* Move IT to the next display element.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4007
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
4008 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
4009 skip to the next visible line start.
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
4010
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4011 Functions get_next_display_element and set_iterator_to_next are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4012 separate because I find this arrangement easier to handle than a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4013 get_next_display_element function that also increments IT's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4014 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
4015 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
4016 increment the iterator position. The other way around we probably
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4017 would either need a flag indicating whether the iterator has to be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4018 incremented the next time, or we would have to implement a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4019 decrement position function which would not be easy to write. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4020
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4021 void
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
4022 set_iterator_to_next (it, reseat_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4023 struct it *it;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
4024 int reseat_p;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4025 {
32553
2bd19f54cd7a (set_iterator_to_next): Reset box start and flags of the
Gerd Moellmann <gerd@gnu.org>
parents: 32539
diff changeset
4026 /* 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
4027 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
4028 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
4029 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
4030
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4031 if (it->method == next_element_from_buffer)
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 /* The current display element of IT is a character from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4034 current_buffer. Advance in the buffer, and maybe skip over
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4035 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
4036 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
4037 reseat_at_next_visible_line_start (it, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4038 else
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 xassert (it->len != 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4041 IT_BYTEPOS (*it) += it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4042 IT_CHARPOS (*it) += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4043 xassert (IT_BYTEPOS (*it) == CHAR_TO_BYTE (IT_CHARPOS (*it)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4044 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4045 }
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4046 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
4047 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4048 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
4049 if (STRINGP (it->string))
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4050 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4051 IT_STRING_BYTEPOS (*it) += it->len;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4052 IT_STRING_CHARPOS (*it) += it->cmp_len;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4053 it->method = next_element_from_string;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4054 goto consider_string_end;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4055 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4056 else
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4057 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4058 IT_BYTEPOS (*it) += it->len;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4059 IT_CHARPOS (*it) += it->cmp_len;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4060 it->method = next_element_from_buffer;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4061 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4062 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4063 else if (it->method == next_element_from_c_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 /* Current display element of IT is from a C string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4066 IT_BYTEPOS (*it) += it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4067 IT_CHARPOS (*it) += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4068 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4069 else if (it->method == next_element_from_display_vector)
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 /* Current display element of IT is from a display table entry.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4072 Advance in the display table definition. Reset it to null if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4073 end reached, and continue with characters from buffers/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4074 strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4075 ++it->current.dpvec_index;
25197
fbe149852f1c (set_iterator_to_next): After delivering a character
Gerd Moellmann <gerd@gnu.org>
parents: 25188
diff changeset
4076
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
4077 /* 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
4078 display vector entry (these entries may contain faces). */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4079 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
4080
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4081 if (it->dpvec + it->current.dpvec_index == it->dpend)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4082 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4083 if (it->s)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4084 it->method = next_element_from_c_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4085 else if (STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4086 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4087 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4088 it->method = next_element_from_buffer;
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 it->dpvec = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4091 it->current.dpvec_index = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4092
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
4093 /* 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
4094 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
4095 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
4096 else if (it->dpvec_char_len > 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4097 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4098 it->len = it->dpvec_char_len;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
4099 set_iterator_to_next (it, reseat_p);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4100 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4101 }
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 else if (it->method == next_element_from_string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4104 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4105 /* Current display element is a character from a Lisp string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4106 xassert (it->s == NULL && STRINGP (it->string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4107 IT_STRING_BYTEPOS (*it) += it->len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4108 IT_STRING_CHARPOS (*it) += 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4109
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4110 consider_string_end:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4111
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4112 if (it->current.overlay_string_index >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4113 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4114 /* IT->string is an overlay string. Advance to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4115 next, if there is one. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4116 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4117 next_overlay_string (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4118 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4119 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4120 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4121 /* IT->string is not an overlay string. If we reached
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4122 its end, and there is something on IT->stack, proceed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4123 with what is on the stack. This can be either another
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4124 string, this time an overlay string, or a buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4125 if (IT_STRING_CHARPOS (*it) == XSTRING (it->string)->size
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4126 && it->sp > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4127 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4128 pop_it (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4129 if (!STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4130 it->method = next_element_from_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4131 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4132 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4133 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4134 else if (it->method == next_element_from_image
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4135 || it->method == next_element_from_stretch)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4136 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4137 /* The position etc with which we have to proceed are on
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4138 the stack. The position may be at the end of a string,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4139 if the `display' property takes up the whole string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4140 pop_it (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4141 it->image_id = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4142 if (STRINGP (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4143 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4144 it->method = next_element_from_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4145 goto consider_string_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4146 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4147 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4148 it->method = next_element_from_buffer;
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4151 /* There are no other methods defined, so this should be a bug. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4152 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4153
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4154 xassert (it->method != next_element_from_string
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4155 || (STRINGP (it->string)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4156 && IT_STRING_CHARPOS (*it) >= 0));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4157 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4160 /* Load IT's display element fields with information about the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4161 display element which comes from a display table entry or from the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4162 result of translating a control character to one of the forms `^C'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4163 or `\003'. IT->dpvec holds the glyphs to return as characters. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4164
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4165 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4166 next_element_from_display_vector (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4167 struct it *it;
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 /* Precondition. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4170 xassert (it->dpvec && it->current.dpvec_index >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4171
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4172 /* Remember the current face id in case glyphs specify faces.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4173 IT's face is restored in set_iterator_to_next. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4174 it->saved_face_id = it->face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4175
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4176 if (INTEGERP (*it->dpvec)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4177 && GLYPH_CHAR_VALID_P (XFASTINT (*it->dpvec)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4178 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4179 int lface_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4180 GLYPH g;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4181
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4182 g = XFASTINT (it->dpvec[it->current.dpvec_index]);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4183 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
4184 it->len = CHAR_BYTES (it->c);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4185
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4186 /* 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
4187 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
4188 zero means no face is specified. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4189 lface_id = FAST_GLYPH_FACE (g);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4190 if (lface_id)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4191 {
30448
92e758e908a2 (next_element_from_display_vector): Improve comments.
Gerd Moellmann <gerd@gnu.org>
parents: 30413
diff changeset
4192 /* The function returns -1 if lface_id is invalid. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4193 int face_id = ascii_face_of_lisp_face (it->f, lface_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4194 if (face_id >= 0)
30448
92e758e908a2 (next_element_from_display_vector): Improve comments.
Gerd Moellmann <gerd@gnu.org>
parents: 30413
diff changeset
4195 it->face_id = face_id;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4196 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4199 /* Display table entry is invalid. Return a space. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4200 it->c = ' ', it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4201
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4202 /* Don't change position and object of the iterator here. They are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4203 still the values of the character that had this display table
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4204 entry or was translated, and that's what we want. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4205 it->what = IT_CHARACTER;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4206 return 1;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4209
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4210 /* Load IT with the next display element from Lisp string IT->string.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4211 IT->current.string_pos is the current position within the string.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4212 If IT->current.overlay_string_index >= 0, the Lisp string is an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4213 overlay string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4214
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4215 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4216 next_element_from_string (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4217 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4218 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4219 struct text_pos position;
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 xassert (STRINGP (it->string));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4222 xassert (IT_STRING_CHARPOS (*it) >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4223 position = it->current.string_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4224
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4225 /* Time to check for invisible text? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4226 if (IT_STRING_CHARPOS (*it) < it->end_charpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4227 && IT_STRING_CHARPOS (*it) == it->stop_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4228 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4229 handle_stop (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4230
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4231 /* Since a handler may have changed IT->method, we must
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4232 recurse here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4233 return get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4234 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4235
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4236 if (it->current.overlay_string_index >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4237 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4238 /* Get the next character from an overlay string. In overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4239 strings, There is no field width or padding with spaces to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4240 do. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4241 if (IT_STRING_CHARPOS (*it) >= XSTRING (it->string)->size)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4242 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4243 it->what = IT_EOB;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4244 return 0;
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 else if (STRING_MULTIBYTE (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4247 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4248 int remaining = (STRING_BYTES (XSTRING (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4249 - IT_STRING_BYTEPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4250 unsigned char *s = (XSTRING (it->string)->data
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4251 + IT_STRING_BYTEPOS (*it));
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
4252 it->c = string_char_and_length (s, remaining, &it->len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4253 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4254 else
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 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4257 it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4258 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4259 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4260 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4261 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4262 /* Get the next character from a Lisp string that is not an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4263 overlay string. Such strings come from the mode line, for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4264 example. We may have to pad with spaces, or truncate the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4265 string. See also next_element_from_c_string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4266 if (IT_STRING_CHARPOS (*it) >= it->end_charpos)
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 it->what = IT_EOB;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4269 return 0;
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 else if (IT_STRING_CHARPOS (*it) >= it->string_nchars)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4272 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4273 /* Pad with spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4274 it->c = ' ', it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4275 CHARPOS (position) = BYTEPOS (position) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4276 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4277 else if (STRING_MULTIBYTE (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4278 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4279 int maxlen = (STRING_BYTES (XSTRING (it->string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4280 - IT_STRING_BYTEPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4281 unsigned char *s = (XSTRING (it->string)->data
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4282 + IT_STRING_BYTEPOS (*it));
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
4283 it->c = string_char_and_length (s, maxlen, &it->len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4284 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4285 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4286 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4287 it->c = XSTRING (it->string)->data[IT_STRING_BYTEPOS (*it)];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4288 it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4289 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4290 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4291
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4292 /* 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
4293 buffer position in IT->position although it could arguably be a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4294 string position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4295 it->what = IT_CHARACTER;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4296 it->object = it->string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4297 it->position = position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4298 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4299 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4300
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4301
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4302 /* Load IT with next display element from C string IT->s.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4303 IT->string_nchars is the maximum number of characters to return
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4304 from the string. IT->end_charpos may be greater than
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4305 IT->string_nchars when this function is called, in which case we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4306 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
4307 reached, including padding spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4308
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4309 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4310 next_element_from_c_string (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4311 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4312 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4313 int success_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4314
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4315 xassert (it->s);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4316 it->what = IT_CHARACTER;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4317 BYTEPOS (it->position) = CHARPOS (it->position) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4318 it->object = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4319
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4320 /* 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
4321 width or precision has been specified when the iterator was
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4322 initialized. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4323 if (IT_CHARPOS (*it) >= it->end_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4324 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4325 /* End of the game. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4326 it->what = IT_EOB;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4327 success_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4328 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4329 else if (IT_CHARPOS (*it) >= it->string_nchars)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4330 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4331 /* Pad with spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4332 it->c = ' ', it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4333 BYTEPOS (it->position) = CHARPOS (it->position) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4334 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4335 else if (it->multibyte_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4336 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4337 /* Implementation note: The calls to strlen apparently aren't a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4338 performance problem because there is no noticeable performance
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4339 difference between Emacs running in unibyte or multibyte mode. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4340 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
4341 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
4342 maxlen, &it->len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4343 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4344 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4345 it->c = it->s[IT_BYTEPOS (*it)], it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4346
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4347 return success_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4348 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4349
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4350
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4351 /* Set up IT to return characters from an ellipsis, if appropriate.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4352 The definition of the ellipsis glyphs may come from a display table
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4353 entry. This function Fills IT with the first glyph from the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4354 ellipsis if an ellipsis is to be displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4355
27106
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4356 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4357 next_element_from_ellipsis (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4358 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4359 {
27106
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4360 if (it->selective_display_ellipsis_p)
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4361 {
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4362 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
4363 {
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4364 /* 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
4365 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
4366 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
4367 it->dpvec_char_len = it->len;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4368 it->dpvec = v->contents;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4369 it->dpend = v->contents + v->size;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4370 it->current.dpvec_index = 0;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4371 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
4372 }
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4373 else
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4374 {
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4375 /* 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
4376 it->dpvec_char_len = it->len;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4377 it->dpvec = default_invis_vector;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4378 it->dpend = default_invis_vector + 3;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4379 it->current.dpvec_index = 0;
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4380 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
4381 }
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4382 }
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4383 else
32585
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
4384 {
34225
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
4385 /* The face at the current position may be different from the
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
4386 face we find after the invisible text. Remember what it
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
4387 was in IT->saved_face_id, and signal that it's there by
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
4388 setting face_before_selective_p. */
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
4389 it->saved_face_id = it->face_id;
32585
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
4390 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
4391 reseat_at_next_visible_line_start (it, 1);
34225
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
4392 it->face_before_selective_p = 1;
32585
bf84251f474b (forward_to_next_line_start): Switch iterator's handling
Gerd Moellmann <gerd@gnu.org>
parents: 32553
diff changeset
4393 }
27106
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4394
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4395 return get_next_display_element (it);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4396 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4397
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4398
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4399 /* Deliver an image display element. The iterator IT is already
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4400 filled with image information (done in handle_display_prop). Value
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4401 is always 1. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4402
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4403
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4404 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4405 next_element_from_image (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4406 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4407 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4408 it->what = IT_IMAGE;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4409 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4410 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4411
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4412
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4413 /* Fill iterator IT with next display element from a stretch glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4414 property. IT->object is the value of the text property. Value is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4415 always 1. */
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 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4418 next_element_from_stretch (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4419 struct it *it;
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 it->what = IT_STRETCH;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4422 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4423 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4424
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4425
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4426 /* Load IT with the next display element from current_buffer. Value
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4427 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
4428 position at which to stop and check for text properties or buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4429 end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4430
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4431 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4432 next_element_from_buffer (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4433 struct it *it;
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 int success_p = 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 /* Check this assumption, otherwise, we would never enter the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4438 if-statement, below. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4439 xassert (IT_CHARPOS (*it) >= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4440 && IT_CHARPOS (*it) <= it->stop_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4441
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4442 if (IT_CHARPOS (*it) >= it->stop_charpos)
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 if (IT_CHARPOS (*it) >= it->end_charpos)
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 int overlay_strings_follow_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4447
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4448 /* End of the game, except when overlay strings follow that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4449 haven't been returned yet. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4450 if (it->overlay_strings_at_end_processed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4451 overlay_strings_follow_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4452 else
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 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
4455 overlay_strings_follow_p = get_overlay_strings (it);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4456 }
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 if (overlay_strings_follow_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4459 success_p = get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4460 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4461 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4462 it->what = IT_EOB;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4463 it->position = it->current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4464 success_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4465 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4466 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4467 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4468 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4469 handle_stop (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4470 return get_next_display_element (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4471 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4472 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4473 else
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 /* No face changes, overlays etc. in sight, so just return a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4476 character from current_buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4477 unsigned char *p;
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 /* Maybe run the redisplay end trigger hook. Performance note:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4480 This doesn't seem to cost measurable time. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4481 if (it->redisplay_end_trigger_charpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4482 && it->glyph_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4483 && IT_CHARPOS (*it) >= it->redisplay_end_trigger_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4484 run_redisplay_end_trigger_hook (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4485
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4486 /* Get the next character, maybe multibyte. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4487 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
4488 if (it->multibyte_p && !ASCII_BYTE_P (*p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4489 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4490 int maxlen = ((IT_BYTEPOS (*it) >= GPT_BYTE ? ZV_BYTE : GPT_BYTE)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4491 - IT_BYTEPOS (*it));
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
4492 it->c = string_char_and_length (p, maxlen, &it->len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4493 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4494 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4495 it->c = *p, it->len = 1;
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 /* Record what we have and where it came from. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4498 it->what = IT_CHARACTER;;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4499 it->object = it->w->buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4500 it->position = it->current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4501
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4502 /* Normally we return the character found above, except when we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4503 really want to return an ellipsis for selective display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4504 if (it->selective)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4505 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4506 if (it->c == '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4507 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4508 /* A value of selective > 0 means hide lines indented more
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4509 than that number of columns. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4510 if (it->selective > 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4511 && IT_CHARPOS (*it) + 1 < ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4512 && indented_beyond_p (IT_CHARPOS (*it) + 1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4513 IT_BYTEPOS (*it) + 1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4514 it->selective))
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
4515 {
27106
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4516 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
4517 it->dpvec_char_len = -1;
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
4518 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4519 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4520 else if (it->c == '\r' && it->selective == -1)
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 /* A value of selective == -1 means that everything from the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4523 CR to the end of the line is invisible, with maybe an
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4524 ellipsis displayed for it. */
27106
0f307c7f49ba (reseat_at_next_visible_line_start): Position before
Gerd Moellmann <gerd@gnu.org>
parents: 27056
diff changeset
4525 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
4526 it->dpvec_char_len = -1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4527 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4528 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4531 /* 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
4532 xassert (!success_p || it->what != IT_CHARACTER || it->len > 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4533 return success_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4534 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4535
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4536
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4537 /* Run the redisplay end trigger hook for IT. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4540 run_redisplay_end_trigger_hook (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4541 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4542 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4543 Lisp_Object args[3];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4544
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4545 /* 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
4546 displaying something, or otherwise we should not run the hook. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4547 xassert (it->glyph_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4548
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4549 /* Set up hook arguments. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4550 args[0] = Qredisplay_end_trigger_functions;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4551 args[1] = it->window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4552 XSETINT (args[2], it->redisplay_end_trigger_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4553 it->redisplay_end_trigger_charpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4554
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4555 /* 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
4556 them again, even if they get an error. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4557 it->w->redisplay_end_trigger = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4558 Frun_hook_with_args (3, args);
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 /* Notice if it changed the face of the character we are on. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4561 handle_face_prop (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4562 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4563
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4564
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4565 /* 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
4566 filled with composition information (done in
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4567 handle_composition_prop). Value is always 1. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4568
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4569 static int
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4570 next_element_from_composition (it)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4571 struct it *it;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4572 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4573 it->what = IT_COMPOSITION;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4574 it->position = (STRINGP (it->string)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4575 ? it->current.string_pos
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4576 : it->current.pos);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4577 return 1;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4578 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4579
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
4580
25012
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 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4583 Moving an iterator without producing glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4584 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4585
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4586 /* Move iterator IT to a specified buffer or X position within one
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4587 line on the display without producing glyphs.
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 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
4590 whichever is reached first.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4591
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4592 TO_CHARPOS <= 0 means no TO_CHARPOS is specified.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4593
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4594 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
4595 0 <= TO_X <= IT->last_visible_x. This means in particular, that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4596 TO_X includes the amount by which a window is horizontally
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4597 scrolled.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4598
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4599 Value is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4600
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4601 MOVE_POS_MATCH_OR_ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4602 - when TO_POS or ZV was reached.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4603
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4604 MOVE_X_REACHED
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4605 -when TO_X was reached before TO_POS or ZV were reached.
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 MOVE_LINE_CONTINUED
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4608 - 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
4609 be continued.
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 MOVE_LINE_TRUNCATED
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4612 - 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
4613 truncated.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4614
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4615 MOVE_NEWLINE_OR_CR
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4616 - 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
4617 display is on. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4618
25693
b12ed057020a (move_it_in_display_line_to): Make type consistent with declaration.
Dave Love <fx@gnu.org>
parents: 25677
diff changeset
4619 static enum move_it_result
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4620 move_it_in_display_line_to (it, to_charpos, to_x, op)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4621 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4622 int to_charpos, to_x, op;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4623 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4624 enum move_it_result result = MOVE_UNDEFINED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4625 struct glyph_row *saved_glyph_row;
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 /* Don't produce glyphs in produce_glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4628 saved_glyph_row = it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4629 it->glyph_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4630
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4631 while (1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4632 {
31506
a1d733428491 (dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents: 31493
diff changeset
4633 int x, i, ascent = 0, descent = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4634
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4635 /* Stop when ZV or TO_CHARPOS reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4636 if (!get_next_display_element (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4637 || ((op & MOVE_TO_POS) != 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4638 && BUFFERP (it->object)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4639 && IT_CHARPOS (*it) >= to_charpos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4640 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4641 result = MOVE_POS_MATCH_OR_ZV;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4642 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4643 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4644
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4645 /* The call to produce_glyphs will get the metrics of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4646 display element IT is loaded with. We record in x the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4647 x-position before this display element in case it does not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4648 fit on the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4649 x = it->current_x;
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4650
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4651 /* 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
4652 fit on the line. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4653 if (!it->truncate_lines_p)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4654 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4655 ascent = it->max_ascent;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4656 descent = it->max_descent;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4657 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4658
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4659 PRODUCE_GLYPHS (it);
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 if (it->area != TEXT_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4662 {
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
4663 set_iterator_to_next (it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4664 continue;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4667 /* The number of glyphs we get back in IT->nglyphs will normally
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4668 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
4669 character on a terminal frame, or (iii) a line end. For the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4670 second case, IT->nglyphs - 1 padding glyphs will be present
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4671 (on X frames, there is only one glyph produced for a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4672 composite character.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4673
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4674 The behavior implemented below means, for continuation lines,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4675 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
4676 displayed there. For terminal frames, as many glyphs of a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4677 multi-glyph character are displayed in the current line, too.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4678 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
4679 way. Under X, the whole shape of a complex character must
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4680 fit on the line or it will be completely displayed in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4681 next line.
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 Note that both for tabs and padding glyphs, all glyphs have
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4684 the same width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4685 if (it->nglyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4686 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4687 /* More than one glyph or glyph doesn't fit on line. All
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4688 glyphs have the same width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4689 int single_glyph_width = it->pixel_width / it->nglyphs;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4690 int new_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4691
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4692 for (i = 0; i < it->nglyphs; ++i, x = new_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4693 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4694 new_x = x + single_glyph_width;
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 /* We want to leave anything reaching TO_X to the caller. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4697 if ((op & MOVE_TO_X) && new_x > to_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4698 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4699 it->current_x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4700 result = MOVE_X_REACHED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4701 break;
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 else if (/* Lines are continued. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4704 !it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4705 && (/* And glyph doesn't fit on the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4706 new_x > it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4707 /* Or it fits exactly and we're on a window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4708 system frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4709 || (new_x == it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4710 && FRAME_WINDOW_P (it->f))))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4711 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4712 if (/* IT->hpos == 0 means the very first glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4713 doesn't fit on the line, e.g. a wide image. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4714 it->hpos == 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4715 || (new_x == it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4716 && FRAME_WINDOW_P (it->f)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4717 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4718 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4719 it->current_x = new_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4720 if (i == it->nglyphs - 1)
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
4721 set_iterator_to_next (it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4722 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4723 else
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4724 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4725 it->current_x = x;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4726 it->max_ascent = ascent;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4727 it->max_descent = descent;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4728 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4729
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4730 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
4731 IT_CHARPOS (*it)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4732 result = MOVE_LINE_CONTINUED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4733 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4734 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4735 else if (new_x > it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4736 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4737 /* Glyph is visible. Increment number of glyphs that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4738 would be displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4739 ++it->hpos;
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4742 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4743 /* Glyph is completely off the left margin of the display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4744 area. Nothing to do. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4745 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4746 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4747
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4748 if (result != MOVE_UNDEFINED)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4749 break;
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 else if ((op & MOVE_TO_X) && it->current_x >= to_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4752 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4753 /* Stop when TO_X specified and reached. This check is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4754 necessary here because of lines consisting of a line end,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4755 only. The line end will not produce any glyphs and we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4756 would never get MOVE_X_REACHED. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4757 xassert (it->nglyphs == 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4758 result = MOVE_X_REACHED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4759 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4760 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4761
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4762 /* Is this a line end? If yes, we're done. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4763 if (ITERATOR_AT_END_OF_LINE_P (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4764 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4765 result = MOVE_NEWLINE_OR_CR;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4766 break;
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 /* The current display element has been consumed. Advance
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4770 to the next. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
4771 set_iterator_to_next (it, 1);
25012
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 /* Stop if lines are truncated and IT's current x-position is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4774 past the right edge of the window now. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4775 if (it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4776 && it->current_x >= it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4777 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4778 result = MOVE_LINE_TRUNCATED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4779 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4780 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4781 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4782
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4783 /* Restore the iterator settings altered at the beginning of this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4784 function. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4785 it->glyph_row = saved_glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4786 return result;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4787 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4788
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4789
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4790 /* Move IT forward to a specified buffer position TO_CHARPOS, TO_X,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4791 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
4792 the description of enum move_operation_enum.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4793
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4794 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
4795 screen line, this function will set IT to the next position >
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4796 TO_CHARPOS. */
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 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4799 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
4800 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4801 int to_charpos, to_x, to_y, to_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4802 int op;
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 enum move_it_result skip, skip2 = MOVE_X_REACHED;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4805 int line_height;
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4806 int reached = 0;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4807
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4808 for (;;)
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 if (op & MOVE_TO_VPOS)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4811 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4812 /* If no TO_CHARPOS and no TO_X specified, stop at the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4813 start of the line TO_VPOS. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4814 if ((op & (MOVE_TO_X | MOVE_TO_POS)) == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4815 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4816 if (it->vpos == to_vpos)
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4817 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4818 reached = 1;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4819 break;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4820 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4821 else
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4822 skip = move_it_in_display_line_to (it, -1, -1, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4823 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4824 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4825 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4826 /* TO_VPOS >= 0 means stop at TO_X in the line at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4827 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
4828 if (it->vpos == to_vpos)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4829 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4830 reached = 2;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4831 break;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4832 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4833
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4834 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
4835
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4836 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
4837 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4838 reached = 3;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4839 break;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4840 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4841 else if (skip == MOVE_X_REACHED && it->vpos != to_vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4842 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4843 /* We have reached TO_X but not in the line we want. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4844 skip = move_it_in_display_line_to (it, to_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4845 -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4846 if (skip == MOVE_POS_MATCH_OR_ZV)
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4847 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4848 reached = 4;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4849 break;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4850 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4851 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4852 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4853 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4854 else if (op & MOVE_TO_Y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4855 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4856 struct it it_backup;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4857
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4858 /* TO_Y specified means stop at TO_X in the line containing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4859 TO_Y---or at TO_CHARPOS if this is reached first. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4860 problem is that we can't really tell whether the line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4861 contains TO_Y before we have completely scanned it, and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4862 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
4863 TO_X.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4864
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4865 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
4866 is to make the outcome of this function more predictable.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4867 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
4868 the line which is probably not what a caller would expect
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4869 to happen. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4870 skip = move_it_in_display_line_to (it, to_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4871 ((op & MOVE_TO_X)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4872 ? to_x : 0),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4873 (MOVE_TO_X
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4874 | (op & MOVE_TO_POS)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4875
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4876 /* 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
4877 if (skip == MOVE_POS_MATCH_OR_ZV)
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4878 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4879 reached = 5;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4880 break;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4881 }
25012
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 /* 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
4884 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
4885 total line height which requires us to scan the rest of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4886 the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4887 if (skip == MOVE_X_REACHED)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4888 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4889 it_backup = *it;
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4890 TRACE_MOVE ((stderr, "move_it: from %d\n", IT_CHARPOS (*it)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4891 skip2 = move_it_in_display_line_to (it, to_charpos, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4892 op & MOVE_TO_POS);
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4893 TRACE_MOVE ((stderr, "move_it: to %d\n", IT_CHARPOS (*it)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4894 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4895
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4896 /* Now, decide whether TO_Y is in this line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4897 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
4898 TRACE_MOVE ((stderr, "move_it: line_height = %d\n", line_height));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4899
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4900 if (to_y >= it->current_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4901 && to_y < it->current_y + line_height)
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 if (skip == MOVE_X_REACHED)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4904 /* 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
4905 we scanned too far. We have to restore IT's settings
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4906 to the ones before skipping. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4907 *it = it_backup;
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4908 reached = 6;
25012
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 else if (skip == MOVE_X_REACHED)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4911 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4912 skip = skip2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4913 if (skip == MOVE_POS_MATCH_OR_ZV)
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4914 reached = 7;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4915 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4916
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4917 if (reached)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4918 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4919 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4920 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4921 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
4922
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4923 switch (skip)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4924 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4925 case MOVE_POS_MATCH_OR_ZV:
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4926 reached = 8;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4927 goto out;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4928
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4929 case MOVE_NEWLINE_OR_CR:
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
4930 set_iterator_to_next (it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4931 it->continuation_lines_width = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4932 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4933
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4934 case MOVE_LINE_TRUNCATED:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4935 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
4936 reseat_at_next_visible_line_start (it, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4937 if ((op & MOVE_TO_POS) != 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4938 && IT_CHARPOS (*it) > to_charpos)
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4939 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4940 reached = 9;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4941 goto out;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4942 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4943 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4944
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4945 case MOVE_LINE_CONTINUED:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4946 it->continuation_lines_width += it->current_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4947 break;
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 default:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4950 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4951 }
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 /* Reset/increment for the next run. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4954 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4955 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4956 it->current_y += it->max_ascent + it->max_descent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4957 ++it->vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4958 last_height = it->max_ascent + it->max_descent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4959 last_max_ascent = it->max_ascent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4960 it->max_ascent = it->max_descent = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4961 }
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4962
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4963 out:
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4964
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
4965 TRACE_MOVE ((stderr, "move_it_to: reached %d\n", reached));
25012
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 /* Move iterator IT backward by a specified y-distance DY, DY >= 0.
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 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
4972 means move IT backward to the preceding line start or BEGV. This
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4973 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
4974 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
4975 set to the top of the line moved to. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4976
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4977 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4978 move_it_vertically_backward (it, dy)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4979 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4980 int dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4981 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4982 int nlines, h, line_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4983 struct it it2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4984 int start_pos = IT_CHARPOS (*it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4985
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4986 xassert (dy >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4987
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4988 /* Estimate how many newlines we must move back. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4989 nlines = max (1, dy / CANON_Y_UNIT (it->f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4990
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4991 /* Set the iterator's position that many lines back. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4992 while (nlines-- && IT_CHARPOS (*it) > BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4993 back_to_previous_visible_line_start (it);
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 /* Reseat the iterator here. When moving backward, we don't want
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4996 reseat to skip forward over invisible text, set up the iterator
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4997 to deliver from overlay strings at the new position etc. So,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4998 use reseat_1 here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
4999 reseat_1 (it, it->current.pos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5000
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5001 /* We are now surely at a line start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5002 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5003
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5004 /* 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
5005 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
5006 height to be able to tell whether we reached the specified
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5007 y-distance. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5008 it2 = *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5009 it2.max_ascent = it2.max_descent = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5010 move_it_to (&it2, start_pos, -1, -1, it2.vpos + 1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5011 MOVE_TO_POS | MOVE_TO_VPOS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5012 xassert (IT_CHARPOS (*it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5013 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
5014
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5015 move_it_to (&it2, start_pos, -1, -1, -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5016 xassert (IT_CHARPOS (*it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5017 h = it2.current_y - it->current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5018 nlines = it2.vpos - it->vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5019
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5020 /* Correct IT's y and vpos position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5021 it->vpos -= nlines;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5022 it->current_y -= h;
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 if (dy == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5025 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5026 /* DY == 0 means move to the start of the screen line. The
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5027 value of nlines is > 0 if continuation lines were involved. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5028 if (nlines > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5029 move_it_by_lines (it, nlines, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5030 xassert (IT_CHARPOS (*it) <= start_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5031 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5032 else if (nlines)
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 /* The y-position we try to reach. Note that h has been
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5035 subtracted in front of the if-statement. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5036 int target_y = it->current_y + h - dy;
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 /* 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
5039 we can. If we moved too far backward, try to move forward. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5040 if (target_y < it->current_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5041 && IT_CHARPOS (*it) > BEGV)
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 move_it_vertically (it, target_y - it->current_y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5044 xassert (IT_CHARPOS (*it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5045 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5046 else if (target_y >= it->current_y + line_height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5047 && IT_CHARPOS (*it) < ZV)
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 move_it_vertically (it, target_y - (it->current_y + line_height));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5050 xassert (IT_CHARPOS (*it) >= BEGV);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5051 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5052 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5053 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5054
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 /* 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
5057 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
5058 end, IT will be on the start of a screen line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5059
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5060 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5061 move_it_vertically (it, dy)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5062 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5063 int dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5064 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5065 if (dy <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5066 move_it_vertically_backward (it, -dy);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5067 else if (dy > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5068 {
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
5069 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
5070 move_it_to (it, ZV, -1, it->current_y + dy, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5071 MOVE_TO_POS | MOVE_TO_Y);
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
5072 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
5073
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5074 /* 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
5075 the line to satisfy the post-condition. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5076 if (IT_CHARPOS (*it) == ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5077 && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5078 move_it_by_lines (it, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5079 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5080 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5081
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5082
35023
6016a947974c (move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35017
diff changeset
5083 /* Move iterator IT past the end of the text line it is in. */
6016a947974c (move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35017
diff changeset
5084
6016a947974c (move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35017
diff changeset
5085 void
6016a947974c (move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35017
diff changeset
5086 move_it_past_eol (it)
6016a947974c (move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35017
diff changeset
5087 struct it *it;
6016a947974c (move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35017
diff changeset
5088 {
6016a947974c (move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35017
diff changeset
5089 enum move_it_result rc;
6016a947974c (move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35017
diff changeset
5090
6016a947974c (move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35017
diff changeset
5091 rc = move_it_in_display_line_to (it, Z, 0, MOVE_TO_POS);
6016a947974c (move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35017
diff changeset
5092 if (rc == MOVE_NEWLINE_OR_CR)
6016a947974c (move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35017
diff changeset
5093 set_iterator_to_next (it, 0);
6016a947974c (move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35017
diff changeset
5094 }
6016a947974c (move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35017
diff changeset
5095
6016a947974c (move_it_past_eol): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35017
diff changeset
5096
34924
db558893a42c (move_it_by_lines): Don't do optimizations if NEED_Y_P
Gerd Moellmann <gerd@gnu.org>
parents: 34900
diff changeset
5097 #if 0 /* Currently not used. */
db558893a42c (move_it_by_lines): Don't do optimizations if NEED_Y_P
Gerd Moellmann <gerd@gnu.org>
parents: 34900
diff changeset
5098
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5099 /* Return non-zero if some text between buffer positions START_CHARPOS
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5100 and END_CHARPOS is invisible. IT->window is the window for text
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5101 property lookup. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5102
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5103 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5104 invisible_text_between_p (it, start_charpos, end_charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5105 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5106 int start_charpos, end_charpos;
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 Lisp_Object prop, limit;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5109 int invisible_found_p;
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 xassert (it != NULL && start_charpos <= end_charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5112
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5113 /* Is text at START invisible? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5114 prop = Fget_char_property (make_number (start_charpos), Qinvisible,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5115 it->window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5116 if (TEXT_PROP_MEANS_INVISIBLE (prop))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5117 invisible_found_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5118 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5119 {
30243
c56062542bae (display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents: 30216
diff changeset
5120 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
5121 Qinvisible, Qnil,
c56062542bae (display_prop_end, invisible_text_between_p):
Miles Bader <miles@gnu.org>
parents: 30216
diff changeset
5122 make_number (end_charpos));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5123 invisible_found_p = XFASTINT (limit) < end_charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5124 }
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 return invisible_found_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5127 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5128
34924
db558893a42c (move_it_by_lines): Don't do optimizations if NEED_Y_P
Gerd Moellmann <gerd@gnu.org>
parents: 34900
diff changeset
5129 #endif /* 0 */
db558893a42c (move_it_by_lines): Don't do optimizations if NEED_Y_P
Gerd Moellmann <gerd@gnu.org>
parents: 34900
diff changeset
5130
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5131
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5132 /* Move IT by a specified number DVPOS of screen lines down. DVPOS
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5133 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
5134 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
5135 NEED_Y_P is zero, IT->current_y will be left unchanged.
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 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
5138 a face with proportional font, we could be faster for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5139 truncate-lines nil. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5140
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5141 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5142 move_it_by_lines (it, dvpos, need_y_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5143 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5144 int dvpos, need_y_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5145 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5146 struct position pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5147
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5148 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5149 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5150 struct text_pos textpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5151
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5152 /* We can use vmotion on frames without proportional fonts. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5153 pos = *vmotion (IT_CHARPOS (*it), dvpos, it->w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5154 SET_TEXT_POS (textpos, pos.bufpos, pos.bytepos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5155 reseat (it, textpos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5156 it->vpos += pos.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5157 it->current_y += pos.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 else if (dvpos == 0)
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 /* DVPOS == 0 means move to the start of the screen line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5162 move_it_vertically_backward (it, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5163 xassert (it->current_x == 0 && it->hpos == 0);
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 else if (dvpos > 0)
34924
db558893a42c (move_it_by_lines): Don't do optimizations if NEED_Y_P
Gerd Moellmann <gerd@gnu.org>
parents: 34900
diff changeset
5166 move_it_to (it, -1, -1, -1, it->vpos + dvpos, MOVE_TO_VPOS);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5167 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5168 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5169 struct it it2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5170 int start_charpos, i;
34924
db558893a42c (move_it_by_lines): Don't do optimizations if NEED_Y_P
Gerd Moellmann <gerd@gnu.org>
parents: 34900
diff changeset
5171
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5172 /* Go back -DVPOS visible lines and reseat the iterator there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5173 start_charpos = IT_CHARPOS (*it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5174 for (i = -dvpos; i && IT_CHARPOS (*it) > BEGV; --i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5175 back_to_previous_visible_line_start (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5176 reseat (it, it->current.pos, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5177 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5178
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5179 /* Above call may have moved too far if continuation lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5180 are involved. Scan forward and see if it did. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5181 it2 = *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5182 it2.vpos = it2.current_y = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5183 move_it_to (&it2, start_charpos, -1, -1, -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5184 it->vpos -= it2.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5185 it->current_y -= it2.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5186 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5187
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5188 /* If we moved too far, move IT some lines forward. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5189 if (it2.vpos > -dvpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5190 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5191 int delta = it2.vpos + dvpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5192 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
5193 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5194 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5195 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5196
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5197
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5198
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5199 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5200 Messages
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5201 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5202
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5203
25798
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5204 /* 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
5205 to *Messages*. */
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5206
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5207 void
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5208 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
5209 char *format;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5210 Lisp_Object arg1, arg2;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5211 {
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5212 Lisp_Object args[3];
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5213 Lisp_Object msg, fmt;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5214 char *buffer;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5215 int len;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5216 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
5217
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5218 fmt = msg = Qnil;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5219 GCPRO4 (fmt, msg, arg1, arg2);
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5220
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5221 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
5222 args[1] = arg1;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5223 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
5224 msg = Fformat (3, args);
25798
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5225
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5226 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
5227 buffer = (char *) alloca (len);
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5228 strcpy (buffer, XSTRING (msg)->data);
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5229
28876
04cbb0510d7e (add_to_log): Pass 1 byte less to message_dolog.
Gerd Moellmann <gerd@gnu.org>
parents: 28869
diff changeset
5230 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
5231 UNGCPRO;
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5232 }
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5233
775d0eca0cc3 (add_to_log): Moved from xfaces.c. Remove frame
Gerd Moellmann <gerd@gnu.org>
parents: 25794
diff changeset
5234
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
5235 /* Output a newline in the *Messages* buffer if "needs" one. */
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
5236
10567
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
5237 void
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
5238 message_log_maybe_newline ()
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
5239 {
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
5240 if (message_log_need_newline)
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5241 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
5242 }
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
5243
65c5552c16cb (message_log_need_newline): This var is now static.
Karl Heuer <kwzh@gnu.org>
parents: 10457
diff changeset
5244
35412
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5245 /* Add a string M of length NBYTES to the message log, optionally
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5246 terminated with a newline when NLFLAG is non-zero. MULTIBYTE, if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5247 nonzero, means interpret the contents of M as multibyte. This
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5248 function calls low-level routines in order to bypass text property
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5249 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
5250
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5251 void
35412
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5252 message_dolog (m, nbytes, nlflag, multibyte)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5253 char *m;
35412
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5254 int nbytes, nlflag, multibyte;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5255 {
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5256 if (!NILP (Vmessage_log_max))
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5257 {
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5258 struct buffer *oldbuf;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5259 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
5260 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
5261 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
5262 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
5263 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
5264 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
5265
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
5266 old_deactivate_mark = Vdeactivate_mark;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5267 oldbuf = current_buffer;
30728
a87e28789082 (Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30721
diff changeset
5268 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
5269 current_buffer->undo_list = Qt;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5270
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5271 oldpoint = Fpoint_marker ();
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5272 oldbegv = Fpoint_min_marker ();
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5273 oldzv = Fpoint_max_marker ();
22500
274456e421ab (message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents: 22399
diff changeset
5274 GCPRO4 (oldpoint, oldbegv, oldzv, old_deactivate_mark);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5275
20703
f465da76f36b (message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 20689
diff changeset
5276 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
5277 point_at_end = 1;
20703
f465da76f36b (message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 20689
diff changeset
5278 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
5279 zv_at_end = 1;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5280
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5281 BEGV = BEG;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5282 BEGV_BYTE = BEG_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5283 ZV = Z;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5284 ZV_BYTE = Z_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5285 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
5286
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
5287 /* 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
5288 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
5289 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
5290 && 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
5291 {
35412
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5292 int i, c, char_bytes;
24040
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
5293 unsigned char work[1];
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5294
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
5295 /* 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
5296 for the *Message* buffer. */
35412
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5297 for (i = 0; i < nbytes; i += nbytes)
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5298 {
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5299 c = string_char_and_length (m + i, nbytes - i, &char_bytes);
24040
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
5300 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
5301 ? c
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
5302 : 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
5303 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
5304 }
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
5305 }
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5306 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
5307 && ! 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
5308 {
35412
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5309 int i, c, char_bytes;
20786
49d68bf8f34b (message_dolog): Cast M to unsigned char * to access bytes.
Richard M. Stallman <rms@gnu.org>
parents: 20703
diff changeset
5310 unsigned char *msg = (unsigned char *) m;
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
5311 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
5312 /* 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
5313 for the *Message* buffer. */
35412
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5314 for (i = 0; i < nbytes; i++)
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
5315 {
24040
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
5316 c = unibyte_char_to_multibyte (msg[i]);
35412
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5317 char_bytes = CHAR_STRING (c, str);
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5318 insert_1_both (str, 1, char_bytes, 1, 0, 0);
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5319 }
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5320 }
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5321 else if (nbytes)
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5322 insert_1 (m, 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
5323
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5324 if (nlflag)
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5325 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5326 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
5327 insert_1 ("\n", 1, 1, 0, 0);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5328
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5329 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
5330 this_bol = PT;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5331 this_bol_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5332
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5333 if (this_bol > BEG)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5334 {
20703
f465da76f36b (message_dolog): Use unibyte_char_to_multibyte.
Richard M. Stallman <rms@gnu.org>
parents: 20689
diff changeset
5335 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
5336 prev_bol = PT;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5337 prev_bol_byte = PT_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5338
20964
4cad33afd914 (message_dolog): Give correct args to
Kenichi Handa <handa@m17n.org>
parents: 20926
diff changeset
5339 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
5340 this_bol, this_bol_byte);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5341 if (dup)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5342 {
20981
0ce30e7ba2b8 Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents: 20964
diff changeset
5343 del_range_both (prev_bol, prev_bol_byte,
0ce30e7ba2b8 Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents: 20964
diff changeset
5344 this_bol, this_bol_byte, 0);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5345 if (dup > 1)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5346 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5347 char dupstr[40];
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5348 int duplen;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5349
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5350 /* 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
5351 change message_log_check_duplicate. */
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5352 sprintf (dupstr, " [%d times]", dup);
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5353 duplen = strlen (dupstr);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5354 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
5355 insert_1 (dupstr, duplen, 1, 0, 1);
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5356 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5357 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5358 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5359
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5360 if (NATNUMP (Vmessage_log_max))
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5361 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5362 scan_newline (Z, Z_BYTE, BEG, BEG_BYTE,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5363 -XFASTINT (Vmessage_log_max) - 1, 0);
20981
0ce30e7ba2b8 Reorder args of del_range_both.
Karl Heuer <kwzh@gnu.org>
parents: 20964
diff changeset
5364 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
5365 }
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5366 }
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5367 BEGV = XMARKER (oldbegv)->charpos;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5368 BEGV_BYTE = marker_byte_position (oldbegv);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5369
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
5370 if (zv_at_end)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5371 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5372 ZV = Z;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5373 ZV_BYTE = Z_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5374 }
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
5375 else
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5376 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5377 ZV = XMARKER (oldzv)->charpos;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5378 ZV_BYTE = marker_byte_position (oldzv);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5379 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5380
20473
f8b70ad2fc2a (message_dolog): Update PT and ZV properly when at end of
Richard M. Stallman <rms@gnu.org>
parents: 20376
diff changeset
5381 if (point_at_end)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5382 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
5383 else
24040
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
5384 /* 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
5385 Lisp code. */
d178122d6122 (message_dolog): Use insert_1_both to avoid running any
Kenichi Handa <handa@m17n.org>
parents: 23784
diff changeset
5386 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
5387 XMARKER (oldpoint)->bytepos);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5388
22500
274456e421ab (message_dolog): GCPRO the oldpoint, oldbegv and oldzv
Richard M. Stallman <rms@gnu.org>
parents: 22399
diff changeset
5389 UNGCPRO;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5390 free_marker (oldpoint);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5391 free_marker (oldbegv);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5392 free_marker (oldzv);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5393
22209
571020b7fc5e (message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents: 22148
diff changeset
5394 tem = Fget_buffer_window (Fcurrent_buffer (), Qt);
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5395 set_buffer_internal (oldbuf);
22209
571020b7fc5e (message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents: 22148
diff changeset
5396 if (NILP (tem))
571020b7fc5e (message_dolog): Do set windows_or_buffers_changed,
Richard M. Stallman <rms@gnu.org>
parents: 22148
diff changeset
5397 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
5398 message_log_need_newline = !nlflag;
21179
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
5399 Vdeactivate_mark = old_deactivate_mark;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5400 }
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5401 }
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5402
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5403
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5404 /* 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
5405 (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
5406 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
5407 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
5408 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
5409
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5410 static int
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5411 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
5412 int prev_bol, this_bol;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5413 int prev_bol_byte, this_bol_byte;
10688
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5414 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5415 int i;
23257
b72cefab3254 (message_log_check_duplicate): Count byte length of the
Kenichi Handa <handa@m17n.org>
parents: 23249
diff changeset
5416 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
5417 int seen_dots = 0;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5418 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
5419 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
5420
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5421 for (i = 0; i < len; i++)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5422 {
33594
a4cd4c93196b (message_log_check_duplicate): Let "..."-detection match
Miles Bader <miles@gnu.org>
parents: 33591
diff changeset
5423 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
5424 seen_dots = 1;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5425 if (p1[i] != p2[i])
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5426 return seen_dots;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5427 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5428 p1 += len;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5429 if (*p1 == '\n')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5430 return 2;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5431 if (*p1++ == ' ' && *p1++ == '[')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5432 {
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5433 int n = 0;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5434 while (*p1 >= '0' && *p1 <= '9')
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5435 n = n * 10 + *p1++ - '0';
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5436 if (strncmp (p1, " times]\n", 8) == 0)
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5437 return n+1;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5438 }
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5439 return 0;
340ceb6ae024 (message_log_check_duplicate): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10667
diff changeset
5440 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5441
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5442
35412
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5443 /* Display an echo area message M with a specified length of NBYTES
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5444 bytes. The string may include null characters. If M is 0, clear
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5445 out any existing message, and let the mini-buffer text show
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5446 through.
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5447
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5448 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
5449 cleared or some other message gets displayed there. This means do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5450 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
5451 a buffer that was alloca'd. */
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5452
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5453 void
35412
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5454 message2 (m, nbytes, multibyte)
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5455 char *m;
35412
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5456 int nbytes;
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5457 int multibyte;
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5458 {
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5459 /* 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
5460 message_log_maybe_newline ();
10416
51c4308d74c9 (message_log_need_newline): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10394
diff changeset
5461 if (m)
35412
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5462 message_dolog (m, nbytes, 1, multibyte);
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5463 message2_nolog (m, nbytes, multibyte);
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5464 }
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5465
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5466
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
5467 /* The non-logging counterpart of message2. */
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5468
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5469 void
35412
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5470 message2_nolog (m, nbytes, multibyte)
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5471 char *m;
35412
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5472 int nbytes;
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
5473 {
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5474 struct frame *sf = SELECTED_FRAME ();
20494
9946c5fb4ff7 (message2_nolog): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20473
diff changeset
5475 message_enable_multibyte = multibyte;
19915
0ee6d171e8af When redisplaying the echo area, use the value
Richard M. Stallman <rms@gnu.org>
parents: 19789
diff changeset
5476
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5477 if (noninteractive)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5478 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5479 if (noninteractive_need_newline)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5480 putc ('\n', stderr);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5481 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
5482 if (m)
35412
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5483 fwrite (m, nbytes, 1, stderr);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5484 if (cursor_in_echo_area == 0)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5485 fprintf (stderr, "\n");
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5486 fflush (stderr);
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5487 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5488 /* 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
5489 initialized yet. Error messages get reported properly by
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5490 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
5491 else if (INTERACTIVE
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5492 && sf->glyphs_initialized_p
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5493 && FRAME_MESSAGE_BUF (sf))
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5494 {
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5495 Lisp_Object mini_window;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5496 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5497
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5498 /* 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
5499 that the selected frame is using. */
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5500 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
5501 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
5502
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5503 FRAME_SAMPLE_VISIBILITY (f);
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5504 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
5505 && ! FRAME_VISIBLE_P (f))
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5506 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
5507
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5508 if (m)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5509 {
35412
acdbc148953f (message_dolog, message2, message2_nolog): Rename
Gerd Moellmann <gerd@gnu.org>
parents: 35410
diff changeset
5510 set_message (m, Qnil, nbytes, multibyte);
16660
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
5511 if (minibuffer_auto_raise)
16f2e24baf42 (message2_nolog): Handle minibuffer_auto_raise.
Richard M. Stallman <rms@gnu.org>
parents: 16570
diff changeset
5512 Fraise_frame (WINDOW_FRAME (XWINDOW (mini_window)));
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5513 }
1527
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
5514 else
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5515 clear_message (1, 1);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5516
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5517 do_pending_window_change (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5518 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
5519 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
5520 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
5521 (*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
5522 }
00109911b040 * xdisp.c (redisplay): Use ! EQ to compare the old and new arrow
Jim Blandy <jimb@redhat.com>
parents: 1446
diff changeset
5523 }
25012
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
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5526 /* 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
5527 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
5528 string, clear out any existing message, and let the mini-buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5529 text show through. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5530
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5531 void
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5532 message3 (m, nbytes, multibyte)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5533 Lisp_Object m;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5534 int nbytes;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5535 int multibyte;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5536 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5537 struct gcpro gcpro1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5538
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5539 GCPRO1 (m);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5540
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5541 /* First flush out any partial line written with print. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5542 message_log_maybe_newline ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5543 if (STRINGP (m))
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5544 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
5545 message3_nolog (m, nbytes, multibyte);
25012
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 UNGCPRO;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5548 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5549
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5550
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5551 /* The non-logging version of message3. */
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 void
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5554 message3_nolog (m, nbytes, multibyte)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5555 Lisp_Object m;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5556 int nbytes, multibyte;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5557 {
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5558 struct frame *sf = SELECTED_FRAME ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5559 message_enable_multibyte = multibyte;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5560
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5561 if (noninteractive)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5562 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5563 if (noninteractive_need_newline)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5564 putc ('\n', stderr);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5565 noninteractive_need_newline = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5566 if (STRINGP (m))
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5567 fwrite (XSTRING (m)->data, nbytes, 1, stderr);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5568 if (cursor_in_echo_area == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5569 fprintf (stderr, "\n");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5570 fflush (stderr);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5571 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5572 /* A null message buffer means that the frame hasn't really been
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5573 initialized yet. Error messages get reported properly by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5574 cmd_error, so this must be just an informative message; toss it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5575 else if (INTERACTIVE
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5576 && sf->glyphs_initialized_p
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5577 && FRAME_MESSAGE_BUF (sf))
25012
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 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
5580 Lisp_Object frame;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5581 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5582
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5583 /* Get the frame containing the mini-buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5584 that the selected frame is using. */
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5585 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
5586 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
5587 f = XFRAME (frame);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5588
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5589 FRAME_SAMPLE_VISIBILITY (f);
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5590 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
5591 && !FRAME_VISIBLE_P (f))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5592 Fmake_frame_visible (frame);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5593
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5594 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
5595 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5596 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
5597 if (minibuffer_auto_raise)
9aff86718a20 (try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents: 25388
diff changeset
5598 Fraise_frame (frame);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5599 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5600 else
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5601 clear_message (1, 1);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5602
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5603 do_pending_window_change (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5604 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
5605 do_pending_window_change (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5606 if (frame_up_to_date_hook != 0 && ! gc_in_progress)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5607 (*frame_up_to_date_hook) (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5608 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5609 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5610
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5611
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5612 /* 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
5613 out any existing message, and let the mini-buffer text show through.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5614
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5615 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
5616 cleared or some other message gets displayed there. Do not pass
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5617 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
5618 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
5619
6366
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
5620 void
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
5621 message1 (m)
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
5622 char *m;
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
5623 {
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5624 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
5625 }
6f28d7614611 (message1): Call message2 instead of duplicating code.
Karl Heuer <kwzh@gnu.org>
parents: 6342
diff changeset
5626
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5627
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5628 /* The non-logging counterpart of message1. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5629
10394
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5630 void
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5631 message1_nolog (m)
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5632 char *m;
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5633 {
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5634 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
5635 }
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5636
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5637 /* 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
5638 which gets replaced with STRING. */
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5639
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5640 void
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5641 message_with_string (m, string, log)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5642 char *m;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5643 Lisp_Object string;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5644 int log;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5645 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5646 if (noninteractive)
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 (m)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5649 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5650 if (noninteractive_need_newline)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5651 putc ('\n', stderr);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5652 noninteractive_need_newline = 0;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5653 fprintf (stderr, m, XSTRING (string)->data);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5654 if (cursor_in_echo_area == 0)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5655 fprintf (stderr, "\n");
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5656 fflush (stderr);
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5657 }
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 else if (INTERACTIVE)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5660 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5661 /* 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
5662 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
5663 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
5664 Lisp_Object mini_window;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5665 struct frame *f, *sf = SELECTED_FRAME ();
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5666
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5667 /* Get the frame containing the minibuffer
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5668 that the selected frame is using. */
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5669 mini_window = FRAME_MINIBUF_WINDOW (sf);
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5670 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5671
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5672 /* 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
5673 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
5674 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
5675 if (FRAME_MESSAGE_BUF (f))
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5676 {
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5677 int len;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5678 char *a[1];
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5679 a[0] = (char *) XSTRING (string)->data;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5680
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5681 len = doprnt (FRAME_MESSAGE_BUF (f),
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5682 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
5683
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5684 if (log)
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5685 message2 (FRAME_MESSAGE_BUF (f), len,
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5686 STRING_MULTIBYTE (string));
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5687 else
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5688 message2_nolog (FRAME_MESSAGE_BUF (f), len,
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5689 STRING_MULTIBYTE (string));
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5690
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5691 /* 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
5692 buffer next time. */
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5693 message_buf_print = 0;
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5694 }
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5695 }
10394
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5696 }
afa796e2b954 (message1_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 10393
diff changeset
5697
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5698
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
5699 /* 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
5700 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
5701
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5702 /* VARARGS 1 */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5703 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5704 message (m, a1, a2, a3)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5705 char *m;
8834
ba6936b88869 (message): Use EMACS_INT.
Richard M. Stallman <rms@gnu.org>
parents: 8797
diff changeset
5706 EMACS_INT a1, a2, a3;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5707 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5708 if (noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5709 {
1446
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
5710 if (m)
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
5711 {
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
5712 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
5713 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
5714 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
5715 fprintf (stderr, m, a1, a2, a3);
2526
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
5716 if (cursor_in_echo_area == 0)
bcba821c17bc (message, message1): If noninteractive and
Richard M. Stallman <rms@gnu.org>
parents: 2324
diff changeset
5717 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
5718 fflush (stderr);
37b3c2981b40 * xdisp.c (message): If M is zero, clear echo_area_glyphs and
Jim Blandy <jimb@redhat.com>
parents: 1124
diff changeset
5719 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5720 }
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5721 else if (INTERACTIVE)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5722 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5723 /* The frame whose mini-buffer we're going to display the message
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5724 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
5725 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
5726 Lisp_Object mini_window;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5727 struct frame *f, *sf = SELECTED_FRAME ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5728
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5729 /* 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
5730 that the selected frame is using. */
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
5731 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
5732 f = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5733
1873
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5734 /* 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
5735 initialized yet. Error messages get reported properly by
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5736 cmd_error, so this must be just an informative message; toss
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5737 it. */
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5738 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
5739 {
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5740 if (m)
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5741 {
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5742 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
5743 #ifdef NO_ARG_ARRAY
20376
67f1753dc577 (message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents: 20363
diff changeset
5744 char *a[3];
67f1753dc577 (message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents: 20363
diff changeset
5745 a[0] = (char *) a1;
67f1753dc577 (message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents: 20363
diff changeset
5746 a[1] = (char *) a2;
67f1753dc577 (message): Declare a as char *[3].
Andreas Schwab <schwab@suse.de>
parents: 20363
diff changeset
5747 a[2] = (char *) a3;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5748
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5749 len = doprnt (FRAME_MESSAGE_BUF (f),
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
5750 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
5751 #else
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
5752 len = doprnt (FRAME_MESSAGE_BUF (f),
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
5753 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
5754 (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
5755 #endif /* NO_ARG_ARRAY */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
5756
20628
05919533e157 (message_dolog, message2): New arg MULTIBYTE.
Richard M. Stallman <rms@gnu.org>
parents: 20580
diff changeset
5757 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
5758 }
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5759 else
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5760 message1 (0);
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5761
c5038f47c602 * xdisp.c (message): Set echo_frame to the frame whose message buf
Jim Blandy <jimb@redhat.com>
parents: 1785
diff changeset
5762 /* 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
5763 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
5764 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
5765 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5766 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5767 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5768
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5769
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
5770 /* The non-logging version of message. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5771
11193
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5772 void
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5773 message_nolog (m, a1, a2, a3)
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5774 char *m;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5775 EMACS_INT a1, a2, a3;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5776 {
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5777 Lisp_Object old_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5778 old_log_max = Vmessage_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5779 Vmessage_log_max = Qnil;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5780 message (m, a1, a2, a3);
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5781 Vmessage_log_max = old_log_max;
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5782 }
b0a12ea680c1 (message_nolog): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11111
diff changeset
5783
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5784
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5785 /* 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
5786 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
5787 critical. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5788
9088
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
5789 void
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
5790 update_echo_area ()
f29b14d21b26 (update_echo_area): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8943
diff changeset
5791 {
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5792 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
5793 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5794 Lisp_Object string;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5795 string = Fcurrent_message ();
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5796 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
5797 !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
5798 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5799 }
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
26447
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5802 /* 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
5803 aren't, make new ones. */
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5804
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5805 static void
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5806 ensure_echo_area_buffers ()
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5807 {
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5808 int i;
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5809
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5810 for (i = 0; i < 2; ++i)
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5811 if (!BUFFERP (echo_buffer[i])
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5812 || NILP (XBUFFER (echo_buffer[i])->name))
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5813 {
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5814 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
5815 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
5816 int j;
0c3f7d0ebb82 (ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents: 30448
diff changeset
5817
0c3f7d0ebb82 (ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents: 30448
diff changeset
5818 old_buffer = echo_buffer[i];
26447
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5819 sprintf (name, " *Echo Area %d*", i);
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5820 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
5821 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
5822
0c3f7d0ebb82 (ensure_echo_area_buffers): If a buffer was killed and a
Gerd Moellmann <gerd@gnu.org>
parents: 30448
diff changeset
5823 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
5824 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
5825 echo_area_buffer[j] = echo_buffer[i];
26447
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5826 }
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5827 }
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5828
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5829
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
5830 /* 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
5831 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
5832
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5833 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
5834 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
5835 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
5836
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5837 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
5838 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
5839
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5840 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
5841 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
5842 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
5843
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5844 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
5845
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5846 static int
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
5847 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
5848 struct window *w;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5849 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
5850 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
5851 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
5852 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
5853 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
5854 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5855 Lisp_Object buffer;
28206
07ac059dece0 (handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents: 28047
diff changeset
5856 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
5857 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
5858
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5859 /* If buffers aren't life, make new ones. */
26447
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
5860 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
5861
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5862 clear_buffer_p = 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5863
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5864 if (which == 0)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5865 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
5866 else if (which > 0)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5867 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
5868 else
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 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
5871 clear_buffer_p = 1;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5872
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5873 /* 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
5874 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
5875 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
5876 && 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
5877 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
5878 }
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 /* 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
5881 have one. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5882 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
5883 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5884 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
5885 = (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
5886 ? echo_buffer[the_other]
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5887 : echo_buffer[this_one]);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5888 clear_buffer_p = 1;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5889 }
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 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
5892
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5893 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
5894 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
5895
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5896 /* 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
5897 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
5898 == 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
5899 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
5900 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
5901 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
5902 aborts. */
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
5903 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
5904 if (w)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5905 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5906 w->buffer = buffer;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5907 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
5908 }
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
5909
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5910 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
5911 current_buffer->read_only = Qnil;
34479
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
5912 specbind (Qinhibit_read_only, Qt);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5913
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5914 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
5915 del_range (BEG, Z);
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 xassert (BEGV >= BEG);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5918 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
5919
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
5920 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
5921
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5922 xassert (BEGV >= BEG);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5923 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
5924
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5925 unbind_to (count, Qnil);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5926 return rc;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5927 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5928
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 /* 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
5931 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
5932
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5933 static Lisp_Object
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5934 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
5935 struct window *w;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5936 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5937 int i = 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5938 Lisp_Object vector;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5939
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5940 /* 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
5941 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
5942 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
5943 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
5944
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5945 if (NILP (vector))
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
5946 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
5947
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5948 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
5949 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
5950 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
5951
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5952 if (w)
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 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
5955 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
5956 XVECTOR (vector)->contents[i++]
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5957 = 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
5958 XVECTOR (vector)->contents[i++]
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5959 = 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
5960 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
5961 else
25358
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 int end = i + 4;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5964 while (i < end)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5965 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
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 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
5969 return vector;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5970 }
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
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5973 /* 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
5974 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
5975
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5976 static Lisp_Object
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5977 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
5978 Lisp_Object vector;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5979 {
34479
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
5980 set_buffer_internal_1 (XBUFFER (AREF (vector, 0)));
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
5981 Vdeactivate_mark = AREF (vector, 1);
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
5982 windows_or_buffers_changed = XFASTINT (AREF (vector, 2));
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
5983
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
5984 if (WINDOWP (AREF (vector, 3)))
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5985 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5986 struct window *w;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5987 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
5988
34479
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
5989 w = XWINDOW (AREF (vector, 3));
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
5990 buffer = AREF (vector, 4);
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
5991 charpos = AREF (vector, 5);
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
5992 bytepos = AREF (vector, 6);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5993
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5994 w->buffer = buffer;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5995 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
5996 XFASTINT (charpos), XFASTINT (bytepos));
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
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
5999 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
6000 return Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6001 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6002
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6003
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6004 /* 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
6005 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
6006
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6007 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6008 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
6009 int multibyte_p;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6010 {
26447
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
6011 ensure_echo_area_buffers ();
2360d692254c (ensure_echo_area_buffers): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26374
diff changeset
6012
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6013 if (!message_buf_print)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6014 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6015 /* 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
6016 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
6017 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
6018 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
6019 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6020 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
6021
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6022 /* 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
6023 set_buffer_internal (XBUFFER (echo_area_buffer[0]));
34479
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
6024
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6025 if (Z > BEG)
34479
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
6026 {
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
6027 int count = BINDING_STACK_SIZE ();
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
6028 specbind (Qinhibit_read_only, Qt);
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
6029 del_range (BEG, Z);
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
6030 unbind_to (count, Qnil);
aab24f62ad6b (setup_echo_area_for_printing, with_echo_area_buffer):
Gerd Moellmann <gerd@gnu.org>
parents: 34448
diff changeset
6031 }
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6032 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
6033
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6034 /* 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
6035 if (multibyte_p
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6036 != !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
6037 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
6038
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6039 /* 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
6040 if (minibuffer_auto_raise)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6041 {
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6042 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
6043 Lisp_Object mini_window;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6044 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
6045 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
6046 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6047
29643
77f1e8db4147 (setup_echo_area_for_printing): Call
Gerd Moellmann <gerd@gnu.org>
parents: 29634
diff changeset
6048 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
6049 message_buf_print = 1;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6050 }
28539
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6051 else
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6052 {
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6053 if (NILP (echo_area_buffer[0]))
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6054 {
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6055 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
6056 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
6057 else
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6058 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
6059 }
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6060
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6061 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
6062 /* Someone switched buffers between print requests. */
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6063 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
6064 }
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6065 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6066
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6067
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6068 /* 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
6069 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
6070 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
6071 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
6072
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6073 static int
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6074 display_echo_area (w)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6075 struct window *w;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6076 {
28047
91d9cd696b80 (display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents: 28002
diff changeset
6077 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
6078
91d9cd696b80 (display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents: 28002
diff changeset
6079 /* 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
6080 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
6081 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
6082 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
6083 redisplay. */
91d9cd696b80 (display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents: 28002
diff changeset
6084 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
6085
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6086 /* 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
6087 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
6088 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
6089 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
6090 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
6091 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
6092
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6093 window_height_changed_p
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6094 = 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
6095 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
6096 (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
6097
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6098 if (no_message_p)
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6099 echo_area_buffer[i] = Qnil;
28047
91d9cd696b80 (display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents: 28002
diff changeset
6100
91d9cd696b80 (display_echo_area): Temporarily inhibit garbage collection.
Gerd Moellmann <gerd@gnu.org>
parents: 28002
diff changeset
6101 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
6102 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
6103 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6104
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6105
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6106 /* 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
6107 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
6108 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
6109 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
6110 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
6111
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6112 static int
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6113 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
6114 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
6115 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
6116 EMACS_INT a3, a4;
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6117 {
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6118 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
6119 Lisp_Object window;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6120 struct text_pos start;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6121 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
6122
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6123 /* 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
6124 matrix for the display. */
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6125 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
6126
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6127 /* Display. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6128 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
6129 XSETWINDOW (window, w);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6130 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
6131 try_window (window, start);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6132
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6133 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
6134 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6135
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6136
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6137 /* 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
6138 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
6139
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6140 void
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6141 resize_echo_area_axactly ()
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6142 {
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6143 if (BUFFERP (echo_area_buffer[0])
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6144 && WINDOWP (echo_area_window))
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6145 {
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6146 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
6147 int resized_p;
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6148
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6149 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
6150 (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
6151 if (resized_p)
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6152 {
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6153 ++windows_or_buffers_changed;
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6154 ++update_mode_lines;
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6155 redisplay_internal (0);
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6156 }
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6157 }
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6158 }
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6159
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6160
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6161 /* 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
6162 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
6163 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
6164 returns. */
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6165
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6166 static int
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6167 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
6168 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
6169 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
6170 EMACS_INT a3, a4;
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6171 {
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6172 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
6173 }
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6174
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6175
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6176 /* 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
6177 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
6178 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
6179 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
6180
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
6181 int
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6182 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
6183 struct window *w;
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
6184 int exact_p;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6185 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6186 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
6187 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
6188
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6189 xassert (MINI_WINDOW_P (w));
25403
5a3db5249db9 (resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents: 25394
diff changeset
6190
5a3db5249db9 (resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents: 25394
diff changeset
6191 /* 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
6192 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
6193 || (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
6194 return 0;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6195
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6196 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
6197 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6198 struct it it;
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6199 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
6200 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
6201 int height, max_height;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6202 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
6203 struct text_pos start;
33591
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6204 struct buffer *old_current_buffer = NULL;
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6205
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6206 if (current_buffer != XBUFFER (w->buffer))
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6207 {
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6208 old_current_buffer = current_buffer;
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6209 set_buffer_internal (XBUFFER (w->buffer));
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6210 }
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6211
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6212 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
6213
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6214 /* 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
6215 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
6216 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
6217 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
6218 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
6219 else
5a3db5249db9 (resize_mini_window): Don't resize if
Gerd Moellmann <gerd@gnu.org>
parents: 25394
diff changeset
6220 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
6221
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6222 /* 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
6223 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
6224 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
6225
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6226 /* 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
6227 if (it.truncate_lines_p)
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6228 height = 1;
26374
e3e89fd28459 Remove conditional computation on USE_TEXT_PROPERTIES.
Gerd Moellmann <gerd@gnu.org>
parents: 26301
diff changeset
6229 else
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6230 {
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6231 last_height = 0;
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6232 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
6233 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
6234 height = it.current_y + last_height;
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6235 else
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6236 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
6237 height -= it.extra_line_spacing;
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6238 height = (height + unit - 1) / unit;
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6239 }
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6240
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6241 /* 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
6242 if (height > max_height)
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6243 {
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6244 height = max_height;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6245 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
6246 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
6247 start = it.current.pos;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6248 }
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6249 else
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
6250 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
6251 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
6252
33314
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6253 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
6254 {
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6255 /* 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
6256 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
6257 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
6258 {
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6259 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
6260 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
6261 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
6262 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
6263 }
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6264 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
6265 && (exact_p || BEGV == ZV))
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6266 {
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6267 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
6268 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
6269 shrink_mini_window (w);
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6270 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
6271 }
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6272 }
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6273 else
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6274 {
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6275 /* 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
6276 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
6277 {
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6278 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
6279 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
6280 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
6281 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
6282 }
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6283 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
6284 {
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6285 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
6286 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
6287 shrink_mini_window (w);
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6288
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6289 if (height)
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6290 {
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6291 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
6292 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
6293 }
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6294
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
6295 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
6296 }
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
6297 }
33591
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6298
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6299 if (old_current_buffer)
b501918e1c9d (resize_mini_window): Temporarily change to the
Gerd Moellmann <gerd@gnu.org>
parents: 33568
diff changeset
6300 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
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 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
6304 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6305
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6306
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6307 /* 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
6308 current message. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6309
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6310 Lisp_Object
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6311 current_message ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6312 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6313 Lisp_Object msg;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6314
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6315 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
6316 msg = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6317 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6318 {
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6319 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
6320 (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
6321 if (NILP (msg))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6322 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
6323 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6324
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6325 return msg;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6326 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6327
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6328
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6329 static int
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6330 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
6331 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
6332 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
6333 EMACS_INT a3, a4;
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6334 {
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6335 Lisp_Object *msg = (Lisp_Object *) a1;
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6336
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6337 if (Z > BEG)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6338 *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
6339 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6340 *msg = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6341 return 0;
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 /* 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
6346 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
6347 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
6348 worth optimizing. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6349
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6350 int
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6351 push_message ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6352 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6353 Lisp_Object msg;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6354 msg = current_message ();
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6355 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
6356 return STRINGP (msg);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6357 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6359
35174
96c7c0a356aa (push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35029
diff changeset
6360 /* Handler for record_unwind_protect calling pop_message. */
96c7c0a356aa (push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35029
diff changeset
6361
96c7c0a356aa (push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35029
diff changeset
6362 Lisp_Object
96c7c0a356aa (push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35029
diff changeset
6363 push_message_unwind (dummy)
96c7c0a356aa (push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35029
diff changeset
6364 Lisp_Object dummy;
96c7c0a356aa (push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35029
diff changeset
6365 {
96c7c0a356aa (push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35029
diff changeset
6366 pop_message ();
96c7c0a356aa (push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35029
diff changeset
6367 return Qnil;
96c7c0a356aa (push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35029
diff changeset
6368 }
96c7c0a356aa (push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35029
diff changeset
6369
96c7c0a356aa (push_message_unwind): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35029
diff changeset
6370
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6371 /* 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
6372
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6373 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6374 restore_message ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6375 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6376 Lisp_Object msg;
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 xassert (CONSP (Vmessage_stack));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6379 msg = XCAR (Vmessage_stack);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6380 if (STRINGP (msg))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6381 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
6382 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6383 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
6384 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6385
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6386
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6387 /* 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
6388
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6389 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6390 pop_message ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6391 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6392 xassert (CONSP (Vmessage_stack));
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6393 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
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 /* 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
6398 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
6399 somewhere. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6400
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6401 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6402 check_message_stack ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6403 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6404 if (!NILP (Vmessage_stack))
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6405 abort ();
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
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6408
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6409 /* 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
6410 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
6411
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6412 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6413 truncate_echo_area (nchars)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6414 int nchars;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6415 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6416 if (nchars == 0)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6417 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
6418 /* 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
6419 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
6420 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
6421 else if (!noninteractive
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6422 && INTERACTIVE
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6423 && !NILP (echo_area_buffer[0]))
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6424 {
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6425 struct frame *sf = SELECTED_FRAME ();
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6426 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
6427 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
6428 }
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6429 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6430
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6431
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6432 /* 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
6433 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
6434
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6435 static int
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6436 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
6437 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
6438 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
6439 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
6440 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6441 if (BEG + nchars < Z)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6442 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
6443 if (Z == BEG)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6444 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
6445 return 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6446 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6447
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6448
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6449 /* 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
6450
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6451 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
6452 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
6453 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
6454
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6455 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
6456 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
6457 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
6458
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6459 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6460 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
6461 char *s;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6462 Lisp_Object string;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6463 int nbytes;
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 message_enable_multibyte
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6466 = ((s && multibyte_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6467 || (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
6468
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6469 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
6470 (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
6471 message_buf_print = 0;
31876
de16d989722a (help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31849
diff changeset
6472 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
6473 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6474
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6475
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6476 /* 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
6477 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
6478 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
6479 current. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6480
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6481 static int
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6482 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
6483 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
6484 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
6485 EMACS_INT nbytes, multibyte_p;
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6486 {
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6487 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
6488 Lisp_Object string = a2;
30413
d5335ebcf501 (with_echo_area_buffer): Take additional EMACS_INT
Gerd Moellmann <gerd@gnu.org>
parents: 30320
diff changeset
6489
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6490 xassert (BEG == Z);
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 /* 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
6493 if (message_enable_multibyte
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6494 != !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
6495 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
6496
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
6497 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
6498
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6499 /* 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
6500 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
6501
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6502 if (STRINGP (string))
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 int nchars;
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 if (nbytes == 0)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6507 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
6508 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
6509
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6510 /* 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
6511 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
6512 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
6513 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
6514 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6515 else if (s)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6516 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6517 if (nbytes == 0)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6518 nbytes = strlen (s);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6519
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6520 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
6521 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6522 /* 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
6523 int i, c, n;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6524 unsigned char work[1];
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6525
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6526 /* 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
6527 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
6528 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6529 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
6530 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
6531 ? c
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6532 : 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
6533 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
6534 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6535 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6536 else if (!multibyte_p
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6537 && !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
6538 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6539 /* 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
6540 int i, c, n;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6541 unsigned char *msg = (unsigned char *) s;
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
6542 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
6543
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6544 /* 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
6545 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
6546 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6547 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
6548 n = CHAR_STRING (c, str);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
6549 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
6550 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6551 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6552 else
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6553 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
6554 }
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 return 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6557 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6558
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6559
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6560 /* 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
6561 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
6562 last displayed. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6563
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6564 void
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6565 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
6566 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
6567 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6568 if (current_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6569 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
6570
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6571 if (last_displayed_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6572 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
6573
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6574 message_buf_print = 0;
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
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6577 /* Clear garbaged frames.
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6578
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6579 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
6580 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
6581 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
6582 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
6583 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
6584 and ensure a complete redisplay of all windows. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6585
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6586 static void
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6587 clear_garbaged_frames ()
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6588 {
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
6589 if (frame_garbaged)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6590 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6591 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6592
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6593 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6594 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6595 struct frame *f = XFRAME (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6596
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6597 if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6598 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6599 clear_current_matrices (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6600 f->garbaged = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6601 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6602 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6603
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
6604 frame_garbaged = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6605 ++windows_or_buffers_changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6606 }
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6607 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6608
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6609
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6610 /* 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
6611 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
6612 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
6613
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6614 static int
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6615 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
6616 int update_frame_p;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6617 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6618 Lisp_Object mini_window;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6619 struct window *w;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6620 struct frame *f;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6621 int window_height_changed_p = 0;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6622 struct frame *sf = SELECTED_FRAME ();
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6623
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6624 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
6625 w = XWINDOW (mini_window);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6626 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
6627
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6628 /* 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
6629 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
6630 return 0;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6631
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
6632 /* 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
6633 #ifndef macintosh
27897
a6384a2b5574 (handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents: 27843
diff changeset
6634 #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
6635 /* 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
6636 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
6637 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
6638 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
6639 && !NILP (Vwindow_system))
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6640 return 0;
27897
a6384a2b5574 (handle_single_display_prop): Use FONT_HEIGHT macro.
Jason Rumney <jasonr@gnu.org>
parents: 27843
diff changeset
6641 #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
6642 #endif
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6643
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6644 /* Redraw garbaged frames. */
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6645 if (frame_garbaged)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6646 clear_garbaged_frames ();
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 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
6649 {
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
6650 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
6651 window_height_changed_p = display_echo_area (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6652 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
6653
33068
a31c3787231b (echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents: 32912
diff changeset
6654 /* 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
6655 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
6656 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
6657 here could cause confusion. */
a31c3787231b (echo_area_display): Don't perform a display update from
Gerd Moellmann <gerd@gnu.org>
parents: 32912
diff changeset
6658 if (update_frame_p && !redisplaying_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6659 {
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6660 int n = 0;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6661
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6662 /* If the display update has been interrupted by pending
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6663 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
6664 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
6665 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
6666 garbaged. This looks odd, so we prevent it here. */
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6667 if (!display_completed)
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6668 n = redisplay_mode_lines (FRAME_ROOT_WINDOW (f), 0);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6669
35598
c332de00af36 (echo_area_display): Comment fix.
Gerd Moellmann <gerd@gnu.org>
parents: 35596
diff changeset
6670 if (window_height_changed_p
c332de00af36 (echo_area_display): Comment fix.
Gerd Moellmann <gerd@gnu.org>
parents: 35596
diff changeset
6671 /* Don't do this if Emacs is shutting down. Redisplay
c332de00af36 (echo_area_display): Comment fix.
Gerd Moellmann <gerd@gnu.org>
parents: 35596
diff changeset
6672 needs to run hooks. */
c332de00af36 (echo_area_display): Comment fix.
Gerd Moellmann <gerd@gnu.org>
parents: 35596
diff changeset
6673 && !NILP (Vrun_hooks))
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6674 {
34900
9ccc4efae7d4 (echo_area_display): Bind redisplay-dont-pause to t
Gerd Moellmann <gerd@gnu.org>
parents: 34851
diff changeset
6675 /* Must update other windows. Likewise as in other
9ccc4efae7d4 (echo_area_display): Bind redisplay-dont-pause to t
Gerd Moellmann <gerd@gnu.org>
parents: 34851
diff changeset
6676 cases, don't let this update be interrupted by
9ccc4efae7d4 (echo_area_display): Bind redisplay-dont-pause to t
Gerd Moellmann <gerd@gnu.org>
parents: 34851
diff changeset
6677 pending input. */
9ccc4efae7d4 (echo_area_display): Bind redisplay-dont-pause to t
Gerd Moellmann <gerd@gnu.org>
parents: 34851
diff changeset
6678 int count = BINDING_STACK_SIZE ();
9ccc4efae7d4 (echo_area_display): Bind redisplay-dont-pause to t
Gerd Moellmann <gerd@gnu.org>
parents: 34851
diff changeset
6679 specbind (Qredisplay_dont_pause, Qt);
31294
52f31a08e52f (echo_area_display): Check display_completed instead
Gerd Moellmann <gerd@gnu.org>
parents: 31170
diff changeset
6680 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
6681 redisplay_internal (0);
34900
9ccc4efae7d4 (echo_area_display): Bind redisplay-dont-pause to t
Gerd Moellmann <gerd@gnu.org>
parents: 34851
diff changeset
6682 unbind_to (count, Qnil);
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6683 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6684 else if (FRAME_WINDOW_P (f) && n == 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6685 {
31294
52f31a08e52f (echo_area_display): Check display_completed instead
Gerd Moellmann <gerd@gnu.org>
parents: 31170
diff changeset
6686 /* Window configuration is the same as before.
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
6687 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
6688 unless we displayed some mode lines. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6689 update_single_window (w, 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6690 rif->flush_display (f);
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6693 update_frame (f, 1, 1);
34068
4a200b2a343b (echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents: 33950
diff changeset
6694
4a200b2a343b (echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents: 33950
diff changeset
6695 /* If cursor is in the echo area, make sure that the next
4a200b2a343b (echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents: 33950
diff changeset
6696 redisplay displays the minibuffer, so that the cursor will
4a200b2a343b (echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents: 33950
diff changeset
6697 be replaced with what the minibuffer wants. */
4a200b2a343b (echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents: 33950
diff changeset
6698 if (cursor_in_echo_area)
4a200b2a343b (echo_area_display): If cursor is in the echo area, make
Gerd Moellmann <gerd@gnu.org>
parents: 33950
diff changeset
6699 ++windows_or_buffers_changed;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6700 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6701 }
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
6702 else if (!EQ (mini_window, selected_window))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6703 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
6704
b38732c75a65 (redisplay_window): Don't ever test just_this_one_p
Gerd Moellmann <gerd@gnu.org>
parents: 25377
diff changeset
6705 /* 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
6706 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
6707
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6708 /* Prevent redisplay optimization in redisplay_internal by resetting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6709 this_line_start_pos. This is done because the mini-buffer now
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6710 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
6711 if (EQ (mini_window, selected_window))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6712 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
6713
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
6714 return window_height_changed_p;
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6717
14465
0936d5e38928 Comment/whitespace changes.
Richard M. Stallman <rms@gnu.org>
parents: 14299
diff changeset
6718
25012
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 Frame Titles
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6721 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6722
6308
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
6723
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
6724 #ifdef HAVE_WINDOW_SYSTEM
25012
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 /* A buffer for constructing frame titles in it; allocated from the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6727 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
6728
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6729 static char *frame_title_buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6730
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6731 /* The buffer's end, and a current output position in it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6732
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6733 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
6734 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
6735
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6736
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6737 /* 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
6738 Re-allocate frame_title_buf if necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6739
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6740 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6741 store_frame_title_char (c)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6742 char c;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6743 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6744 /* If output position has reached the end of the allocated buffer,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6745 double the buffer's size. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6746 if (frame_title_ptr == frame_title_buf_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6747 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6748 int len = frame_title_ptr - frame_title_buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6749 int new_size = 2 * len * sizeof *frame_title_buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6750 frame_title_buf = (char *) xrealloc (frame_title_buf, new_size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6751 frame_title_buf_end = frame_title_buf + new_size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6752 frame_title_ptr = frame_title_buf + len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6753 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6754
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6755 *frame_title_ptr++ = c;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6756 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6757
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6758
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6759 /* Store part of a frame title in frame_title_buf, beginning at
35410
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
6760 frame_title_ptr. STR is the string to store. Do not copy
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
6761 characters that yield more columns than PRECISION; PRECISION <= 0
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
6762 means copy the whole string. Pad with spaces until FIELD_WIDTH
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
6763 number of characters have been copied; FIELD_WIDTH <= 0 means don't
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
6764 pad. Called from display_mode_element when it is used to build a
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
6765 frame title. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6766
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
6767 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6768 store_frame_title (str, field_width, precision)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6769 unsigned char *str;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6770 int field_width, precision;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6771 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6772 int n = 0;
35410
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
6773 int dummy, nbytes, width;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6774
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6775 /* Copy at most PRECISION chars from STR. */
35410
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
6776 nbytes = strlen (str);
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
6777 n+= c_string_width (str, nbytes, precision, &dummy, &nbytes);
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
6778 while (nbytes--)
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
6779 store_frame_title_char (*str++);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6780
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6781 /* Fill up with spaces until FIELD_WIDTH reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6782 while (field_width > 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6783 && n < field_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6784 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6785 store_frame_title_char (' ');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6786 ++n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6787 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6788
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6789 return n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6790 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6791
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 /* 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
6794 Vicon_title_format if FRAME is iconified, otherwise it is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6795 frame_title_format. */
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
6796
6308
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
6797 static void
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
6798 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
6799 Lisp_Object frame;
f34deea7dc2c (x_consider_frame_title): New function, extracted from display_mode_line.
Karl Heuer <kwzh@gnu.org>
parents: 6278
diff changeset
6800 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6801 struct frame *f = XFRAME (frame);
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 if (FRAME_WINDOW_P (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6804 || FRAME_MINIBUF_ONLY_P (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6805 || f->explicit_name)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6806 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6807 /* Do we have more than one visible frame on this X display? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6808 Lisp_Object tail;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6809 Lisp_Object fmt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6810 struct buffer *obuf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6811 int len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6812 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6813
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
6814 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
6815 {
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
6816 struct frame *tf = XFRAME (XCAR (tail));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6817
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6818 if (tf != f
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6819 && FRAME_KBOARD (tf) == FRAME_KBOARD (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6820 && !FRAME_MINIBUF_ONLY_P (tf)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6821 && (FRAME_VISIBLE_P (tf) || FRAME_ICONIFIED_P (tf)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6822 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6823 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6824
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6825 /* Set global variable indicating that multiple frames exist. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6826 multiple_frames = CONSP (tail);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6827
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6828 /* Switch to the buffer of selected window of the frame. Set up
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6829 frame_title_ptr so that display_mode_element will output into it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6830 then display the title. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6831 obuf = current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6832 Fset_buffer (XWINDOW (f->selected_window)->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6833 fmt = FRAME_ICONIFIED_P (f) ? Vicon_title_format : Vframe_title_format;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6834 frame_title_ptr = frame_title_buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6835 init_iterator (&it, XWINDOW (f->selected_window), -1, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6836 NULL, DEFAULT_FACE_ID);
35410
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
6837 display_mode_element (&it, 0, -1, -1, fmt);
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
6838 len = frame_title_ptr - frame_title_buf;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6839 frame_title_ptr = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6840 set_buffer_internal (obuf);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6841
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6842 /* Set the title only if it's changed. This avoids consing in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6843 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
6844 already wasted too much time by walking through the list with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6845 display_mode_element, then we might need to optimize at a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6846 higher level than this.) */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6847 if (! STRINGP (f->name)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6848 || STRING_BYTES (XSTRING (f->name)) != len
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6849 || bcmp (frame_title_buf, XSTRING (f->name)->data, len) != 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6850 x_implicitly_set_name (f, make_string (frame_title_buf, len), Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6851 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6852 }
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 #else /* not HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6855
8783
226c214398a6 [!HAVE_X_WINDOWS] (frame_title_ptr): define as always null.
Karl Heuer <kwzh@gnu.org>
parents: 8772
diff changeset
6856 #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
6857 #define store_frame_title(str, mincol, maxcol) 0
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6858
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6859 #endif /* not HAVE_WINDOW_SYSTEM */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6860
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6861
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6862
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6863
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6864 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6865 Menu Bars
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6866 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6867
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6868
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6869 /* Prepare for redisplay by updating menu-bar item lists when
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6870 appropriate. This can call eval. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6871
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6872 void
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6873 prepare_menu_bars ()
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6874 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6875 int all_windows;
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6876 struct gcpro gcpro1, gcpro2;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6877 struct frame *f;
34448
8f8d6aa6af8b (prepare_menu_bars): Changes for tip_frame being a
Gerd Moellmann <gerd@gnu.org>
parents: 34440
diff changeset
6878 Lisp_Object tooltip_frame;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6879
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6880 #ifdef HAVE_X_WINDOWS
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6881 tooltip_frame = tip_frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6882 #else
34448
8f8d6aa6af8b (prepare_menu_bars): Changes for tip_frame being a
Gerd Moellmann <gerd@gnu.org>
parents: 34440
diff changeset
6883 tooltip_frame = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6884 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6885
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6886 /* Update all frame titles based on their buffer names, etc. We do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6887 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
6888 up-to-date frame titles. */
13419
2a17eca35e88 [HAVE_NTGUI] (set_menu_framebar): Declare external.
Geoff Voelker <voelker@cs.washington.edu>
parents: 13370
diff changeset
6889 #ifdef HAVE_WINDOW_SYSTEM
13826
cbe1d1a07eb2 (prepare_menu_bars): If update_mode_lines,
Richard M. Stallman <rms@gnu.org>
parents: 13760
diff changeset
6890 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
6891 {
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
6892 Lisp_Object tail, frame;
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
6893
d7c32bcc6cc5 (prepare_menu_bars): Update frame titles before menu bars.
Karl Heuer <kwzh@gnu.org>
parents: 11910
diff changeset
6894 FOR_EACH_FRAME (tail, frame)
25012
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 f = XFRAME (frame);
34448
8f8d6aa6af8b (prepare_menu_bars): Changes for tip_frame being a
Gerd Moellmann <gerd@gnu.org>
parents: 34440
diff changeset
6897 if (!EQ (frame, tooltip_frame)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6898 && (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6899 x_consider_frame_title (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6900 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6901 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6902 #endif /* HAVE_WINDOW_SYSTEM */
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 lists, if appropriate. This has to be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6905 done before any actual redisplay or generation of display lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6906 all_windows = (update_mode_lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6907 || buffer_shared > 1
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6908 || windows_or_buffers_changed);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6909 if (all_windows)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6910 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6911 Lisp_Object tail, frame;
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
6912 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
6913
21179
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
6914 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
6915
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6916 FOR_EACH_FRAME (tail, frame)
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6917 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6918 f = XFRAME (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6919
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6920 /* Ignore tooltip frame. */
34448
8f8d6aa6af8b (prepare_menu_bars): Changes for tip_frame being a
Gerd Moellmann <gerd@gnu.org>
parents: 34440
diff changeset
6921 if (EQ (frame, tooltip_frame))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6922 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6923
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6924 /* If a window on this frame changed size, report that to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6925 the user and clear the size-change flag. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6926 if (FRAME_WINDOW_SIZES_CHANGED (f))
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6927 {
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6928 Lisp_Object functions;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6929
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6930 /* Clear flag first in case we get an error below. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6931 FRAME_WINDOW_SIZES_CHANGED (f) = 0;
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6932 functions = Vwindow_size_change_functions;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6933 GCPRO2 (tail, functions);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6934
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6935 while (CONSP (functions))
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6936 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6937 call1 (XCAR (functions), frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6938 functions = XCDR (functions);
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6939 }
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6940 UNGCPRO;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6941 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6942
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6943 GCPRO1 (tail);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6944 update_menu_bar (f, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6945 #ifdef HAVE_WINDOW_SYSTEM
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
6946 update_tool_bar (f, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6947 #endif
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6948 UNGCPRO;
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
6949 }
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6950
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6951 unbind_to (count, Qnil);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6952 }
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
6953 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6954 {
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6955 struct frame *sf = SELECTED_FRAME ();
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6956 update_menu_bar (sf, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6957 #ifdef HAVE_WINDOW_SYSTEM
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
6958 update_tool_bar (sf, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6959 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6960 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6961
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6962 /* Motif needs this. See comment in xmenu.c. Turn it off when
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6963 pending_menu_activation is not defined. */
15813
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
6964 #ifdef USE_X_TOOLKIT
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
6965 pending_menu_activation = 0;
c52454296042 (prepare_menu_bars): Conditionalize previous change.
Richard M. Stallman <rms@gnu.org>
parents: 15543
diff changeset
6966 #endif
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6967 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6968
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6969
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6970 /* 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
6971 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
6972 eval.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6973
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6974 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
6975
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6976 static void
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6977 update_menu_bar (f, save_match_data)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
6978 struct frame *f;
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
6979 int save_match_data;
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6980 {
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
6981 Lisp_Object window;
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
6982 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
6983
6872
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
6984 window = FRAME_SELECTED_WINDOW (f);
7c12310c8b86 (update_menu_bar): Take frame as arg.
Richard M. Stallman <rms@gnu.org>
parents: 6741
diff changeset
6985 w = XWINDOW (window);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6986
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6987 if (update_mode_lines)
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6988 w->update_mode_line = Qt;
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6989
14265
9bc9be522a4d (update_menu__ba, redisplay_window) :" Use FRAME_WINDOW_P
Geoff Voelker <voelker@cs.washington.edu>
parents: 14263
diff changeset
6990 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
6991 ?
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
6992 #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
6993 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
6994 #else
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
6995 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
6996 #endif
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
6997 : FRAME_MENU_BAR_LINES (f) > 0)
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6998 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
6999 /* 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
7000 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
7001 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
7002 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
7003 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
7004 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
7005 windows_or_buffers_changed anyway. */
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
7006 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
7007 || !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
7008 || ((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
7009 < BUF_MODIFF (XBUFFER (w->buffer)))
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
7010 != !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
7011 || ((!NILP (Vtransient_mark_mode)
497ad07c31c2 (update_menu_bar): Do update if region display has changed.
Karl Heuer <kwzh@gnu.org>
parents: 12017
diff changeset
7012 && !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
7013 != !NILP (w->region_showing)))
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
7014 {
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
7015 struct buffer *prev = current_buffer;
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
7016 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
7017
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
7018 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
7019 if (save_match_data)
21179
482ff111ccbc (message_dolog): Save and restore Vdeactivate_mark.
Richard M. Stallman <rms@gnu.org>
parents: 21028
diff changeset
7020 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
7021 if (NILP (Voverriding_local_map_menu_flag))
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
7022 {
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
7023 specbind (Qoverriding_terminal_local_map, Qnil);
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
7024 specbind (Qoverriding_local_map, Qnil);
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
7025 }
11761
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
7026
12141
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
7027 /* Run the Lucid hook. */
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
7028 call1 (Vrun_hooks, Qactivate_menubar_hook);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7029
12141
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
7030 /* If it has changed current-menubar from previous value,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7031 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
7032 if (! NILP (Vlucid_menu_bar_dirty_flag))
9265a67ccf1a (update_menu_bar): Run activate-menubar-hook
Karl Heuer <kwzh@gnu.org>
parents: 12081
diff changeset
7033 call0 (Qrecompute_lucid_menubar);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7034
14299
037a89c9d068 (update_menu_bar):
Karl Heuer <kwzh@gnu.org>
parents: 14265
diff changeset
7035 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
7036 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
7037
15543
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
7038 /* 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
7039 #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
7040 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
7041 #if defined (macintosh)
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
7042 /* 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
7043 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
7044 && f == SELECTED_FRAME ()
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
7045 #endif
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
7046 )
13459
96fdfde22e87 (display_text_line): Get redisplay_end_trigger from window.
Richard M. Stallman <rms@gnu.org>
parents: 13419
diff changeset
7047 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
7048 else
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
7049 /* On a terminal screen, the menu bar is an ordinary screen
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7050 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
7051 w->update_mode_line = Qt;
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
7052 #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
7053 /* 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
7054 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
7055 w->update_mode_line = Qt;
1047c2816dd4 (redisplay_internal): Use last_had_star to decide
Richard M. Stallman <rms@gnu.org>
parents: 15382
diff changeset
7056 #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
7057
d110042c1d95 (prepare_menu_bars): Save and restore the match data.
Richard M. Stallman <rms@gnu.org>
parents: 11719
diff changeset
7058 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
7059 set_buffer_internal_1 (prev);
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
7060 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
7061 }
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
7062 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7063
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7064
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
7065
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7066 /***********************************************************************
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7067 Tool-bars
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7068 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7069
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7070 #ifdef HAVE_WINDOW_SYSTEM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7071
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7072 /* 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
7073 before we start to fill in any display lines. Called from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7074 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
7075 and restore it here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7076
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7077 static void
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7078 update_tool_bar (f, save_match_data)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7079 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7080 int save_match_data;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7081 {
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7082 if (WINDOWP (f->tool_bar_window)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7083 && XFASTINT (XWINDOW (f->tool_bar_window)->height) > 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7084 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7085 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7086 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7087
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7088 window = FRAME_SELECTED_WINDOW (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7089 w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7090
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7091 /* If the user has switched buffers or windows, we need to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7092 recompute to reflect the new bindings. But we'll
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7093 recompute when update_mode_lines is set too; that means
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7094 that people can use force-mode-line-update to request
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7095 that the menu bar be recomputed. The adverse effect on
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7096 the rest of the redisplay algorithm is about the same as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7097 windows_or_buffers_changed anyway. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7098 if (windows_or_buffers_changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7099 || !NILP (w->update_mode_line)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7100 || ((BUF_SAVE_MODIFF (XBUFFER (w->buffer))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7101 < BUF_MODIFF (XBUFFER (w->buffer)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7102 != !NILP (w->last_had_star))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7103 || ((!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7104 && !NILP (XBUFFER (w->buffer)->mark_active))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7105 != !NILP (w->region_showing)))
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 struct buffer *prev = current_buffer;
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
7108 int count = BINDING_STACK_SIZE ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7109
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7110 /* Set current_buffer to the buffer of the selected
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7111 window of the frame, so that we get the right local
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7112 keymaps. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7113 set_buffer_internal_1 (XBUFFER (w->buffer));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7114
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7115 /* Save match data, if we must. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7116 if (save_match_data)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7117 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7118
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7119 /* Make sure that we don't accidentally use bogus keymaps. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7120 if (NILP (Voverriding_local_map_menu_flag))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7121 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7122 specbind (Qoverriding_terminal_local_map, Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7123 specbind (Qoverriding_local_map, Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7124 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7125
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7126 /* 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
7127 f->tool_bar_items
07c6230bc933 (update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents: 33757
diff changeset
7128 = 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
7129
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7130 /* Redisplay the tool-bar in case we changed it. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7131 w->update_mode_line = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7132
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7133 unbind_to (count, Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7134 set_buffer_internal_1 (prev);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7135 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7136 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7137 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7138
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7139
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7140 /* 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
7141 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
7142 been set up previously by calling prepare_menu_bars. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7143
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7144 static void
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7145 build_desired_tool_bar_string (f)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7146 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7147 {
35246
4e6bbe9c1780 (build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents: 35200
diff changeset
7148 int i, size, size_needed;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7149 struct gcpro gcpro1, gcpro2, gcpro3;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7150 Lisp_Object image, plist, props;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7151
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7152 image = plist = props = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7153 GCPRO3 (image, plist, props);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7154
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7155 /* 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
7156 Otherwise, make a new string. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7157
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7158 /* 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
7159 size = (STRINGP (f->desired_tool_bar_string)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7160 ? XSTRING (f->desired_tool_bar_string)->size
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7161 : 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7162
35267
5695de532559 (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents: 35246
diff changeset
7163 /* We need one space in the string for each image. */
5695de532559 (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents: 35246
diff changeset
7164 size_needed = f->n_tool_bar_items;
5695de532559 (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents: 35246
diff changeset
7165
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7166 /* Reuse f->desired_tool_bar_string, if possible. */
35474
1859c648801a (build_desired_tool_bar_string): Make sure we have
Gerd Moellmann <gerd@gnu.org>
parents: 35465
diff changeset
7167 if (size < size_needed || NILP (f->desired_tool_bar_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
7168 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
7169 make_number (' '));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7170 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7171 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7172 props = list4 (Qdisplay, Qnil, Qmenu_item, Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7173 Fremove_text_properties (make_number (0), make_number (size),
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7174 props, f->desired_tool_bar_string);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7175 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7176
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7177 /* 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
7178 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
7179 is the index of the item in F's tool-bar item vector. */
35246
4e6bbe9c1780 (build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents: 35200
diff changeset
7180 for (i = 0; i < f->n_tool_bar_items; ++i)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7181 {
33762
07c6230bc933 (update_tool_bar, build_desired_tool_bar_string): Change
Gerd Moellmann <gerd@gnu.org>
parents: 33757
diff changeset
7182 #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
7183
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7184 int enabled_p = !NILP (PROP (TOOL_BAR_ITEM_ENABLED_P));
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7185 int selected_p = !NILP (PROP (TOOL_BAR_ITEM_SELECTED_P));
35277
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7186 int hmargin, vmargin, relief, idx, end;
35361
1b5e3bc8ce89 * xdisp.c (build_desired_tool_bar_string): Use :conversion instead
Gerd Moellmann <gerd@gnu.org>
parents: 35357
diff changeset
7187 extern Lisp_Object QCrelief, QCmargin, QCconversion, Qimage;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7188 extern Lisp_Object Qlaplace;
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 /* If image is a vector, choose the image according to the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7191 button state. */
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7192 image = PROP (TOOL_BAR_ITEM_IMAGES);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7193 if (VECTORP (image))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7194 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7195 if (enabled_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7196 idx = (selected_p
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7197 ? TOOL_BAR_IMAGE_ENABLED_SELECTED
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7198 : TOOL_BAR_IMAGE_ENABLED_DESELECTED);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7199 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7200 idx = (selected_p
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7201 ? TOOL_BAR_IMAGE_DISABLED_SELECTED
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7202 : TOOL_BAR_IMAGE_DISABLED_DESELECTED);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7203
31650
8b3846ae64fe (build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents: 31610
diff changeset
7204 xassert (ASIZE (image) >= idx);
8b3846ae64fe (build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents: 31610
diff changeset
7205 image = AREF (image, idx);
8b3846ae64fe (build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents: 31610
diff changeset
7206 }
8b3846ae64fe (build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents: 31610
diff changeset
7207 else
8b3846ae64fe (build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents: 31610
diff changeset
7208 idx = -1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7209
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7210 /* Ignore invalid image specifications. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7211 if (!valid_image_p (image))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7212 continue;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7213
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7214 /* Display the tool-bar button pressed, or depressed. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7215 plist = Fcopy_sequence (XCDR (image));
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 /* Compute margin and relief to draw. */
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7218 relief = tool_bar_button_relief > 0 ? tool_bar_button_relief : 3;
35277
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7219 hmargin = vmargin = relief;
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7220
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7221 if (INTEGERP (Vtool_bar_button_margin)
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7222 && XINT (Vtool_bar_button_margin) > 0)
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7223 {
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7224 hmargin += XFASTINT (Vtool_bar_button_margin);
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7225 vmargin += XFASTINT (Vtool_bar_button_margin);
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7226 }
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7227 else if (CONSP (Vtool_bar_button_margin))
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7228 {
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7229 if (INTEGERP (XCAR (Vtool_bar_button_margin))
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7230 && XINT (XCAR (Vtool_bar_button_margin)) > 0)
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7231 hmargin += XFASTINT (XCAR (Vtool_bar_button_margin));
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7232
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7233 if (INTEGERP (XCDR (Vtool_bar_button_margin))
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7234 && XINT (XCDR (Vtool_bar_button_margin)) > 0)
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7235 vmargin += XFASTINT (XCDR (Vtool_bar_button_margin));
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7236 }
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7237
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7238 if (auto_raise_tool_bar_buttons_p)
25012
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 /* Add a `:relief' property to the image spec if the item is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7241 selected. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7242 if (selected_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7243 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7244 plist = Fplist_put (plist, QCrelief, make_number (-relief));
35277
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7245 hmargin -= relief;
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7246 vmargin -= relief;
25012
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7249 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7250 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7251 /* If image is selected, display it pressed, i.e. with a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7252 negative relief. If it's not selected, display it with a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7253 raised relief. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7254 plist = Fplist_put (plist, QCrelief,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7255 (selected_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7256 ? make_number (-relief)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7257 : make_number (relief)));
35277
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7258 hmargin -= relief;
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7259 vmargin -= relief;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7260 }
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 /* Put a margin around the image. */
35277
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7263 if (hmargin || vmargin)
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7264 {
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7265 if (hmargin == vmargin)
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7266 plist = Fplist_put (plist, QCmargin, make_number (hmargin));
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7267 else
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7268 plist = Fplist_put (plist, QCmargin,
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7269 Fcons (make_number (hmargin),
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7270 make_number (vmargin)));
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
7271 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7272
31650
8b3846ae64fe (build_desired_tool_bar_string): For a toolbar item in
Gerd Moellmann <gerd@gnu.org>
parents: 31610
diff changeset
7273 /* 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
7274 for the disabled state, make the image appear disabled by
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7275 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
7276 if (!enabled_p && idx < 0)
35361
1b5e3bc8ce89 * xdisp.c (build_desired_tool_bar_string): Use :conversion instead
Gerd Moellmann <gerd@gnu.org>
parents: 35357
diff changeset
7277 plist = Fplist_put (plist, QCconversion, Qdisabled);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7278
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7279 /* Put a `display' text property on the string for the image to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7280 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
7281 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
7282 vector. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7283 image = Fcons (Qimage, plist);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7284 props = list4 (Qdisplay, image,
35246
4e6bbe9c1780 (build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents: 35200
diff changeset
7285 Qmenu_item, make_number (i * TOOL_BAR_ITEM_NSLOTS));
4e6bbe9c1780 (build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents: 35200
diff changeset
7286
4e6bbe9c1780 (build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents: 35200
diff changeset
7287 /* Let the last image hide all remaining spaces in the tool bar
4e6bbe9c1780 (build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents: 35200
diff changeset
7288 string. The string can be longer than needed when we reuse a
4e6bbe9c1780 (build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents: 35200
diff changeset
7289 previous string. */
4e6bbe9c1780 (build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents: 35200
diff changeset
7290 if (i + 1 == f->n_tool_bar_items)
4e6bbe9c1780 (build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents: 35200
diff changeset
7291 end = XSTRING (f->desired_tool_bar_string)->size;
4e6bbe9c1780 (build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents: 35200
diff changeset
7292 else
4e6bbe9c1780 (build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents: 35200
diff changeset
7293 end = i + 1;
4e6bbe9c1780 (build_desired_tool_bar_string): Correct the computation
Gerd Moellmann <gerd@gnu.org>
parents: 35200
diff changeset
7294 Fadd_text_properties (make_number (i), make_number (end),
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7295 props, f->desired_tool_bar_string);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7296 #undef PROP
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7297 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7298
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7299 UNGCPRO;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7300 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7301
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7302
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7303 /* Display one line of the tool-bar of frame IT->f. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7304
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7305 static void
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7306 display_tool_bar_line (it)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7307 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7308 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7309 struct glyph_row *row = it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7310 int max_x = it->last_visible_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7311 struct glyph *last;
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 prepare_desired_row (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7314 row->y = it->current_y;
34500
41ad2cf8ccb8 (display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 34479
diff changeset
7315
41ad2cf8ccb8 (display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 34479
diff changeset
7316 /* Note that this isn't made use of if the face hasn't a box,
41ad2cf8ccb8 (display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 34479
diff changeset
7317 so there's no need to check the face here. */
41ad2cf8ccb8 (display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 34479
diff changeset
7318 it->start_of_box_run_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7319
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7320 while (it->current_x < max_x)
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 int x_before, x, n_glyphs_before, i, nglyphs;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7323
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7324 /* Get the next display element. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7325 if (!get_next_display_element (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7326 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7327
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7328 /* Produce glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7329 x_before = it->current_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7330 n_glyphs_before = it->glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7331 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7332
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7333 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7334 i = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7335 x = x_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7336 while (i < nglyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7337 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7338 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7339
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7340 if (x + glyph->pixel_width > max_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7341 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7342 /* Glyph doesn't fit on line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7343 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7344 it->current_x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7345 goto out;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7346 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7347
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7348 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7349 x += glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7350 ++i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7351 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7352
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7353 /* Stop at line ends. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7354 if (ITERATOR_AT_END_OF_LINE_P (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7355 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7356
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
7357 set_iterator_to_next (it, 1);
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7360 out:;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7361
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7362 row->displays_text_p = row->used[TEXT_AREA] != 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7363 extend_face_to_end_of_line (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7364 last = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA] - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7365 last->right_box_line_p = 1;
34500
41ad2cf8ccb8 (display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 34479
diff changeset
7366 if (last == row->glyphs[TEXT_AREA])
41ad2cf8ccb8 (display_tool_bar_line): Make sure that tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 34479
diff changeset
7367 last->left_box_line_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7368 compute_line_metrics (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7369
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7370 /* 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
7371 if (!row->displays_text_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7372 {
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
7373 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
7374 row->ascent = row->phys_ascent = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7375 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7376
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7377 row->full_width_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7378 row->continued_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7379 row->truncated_on_left_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7380 row->truncated_on_right_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7381
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7382 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7383 it->current_y += row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7384 ++it->vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7385 ++it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7386 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7387
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7388
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7389 /* 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
7390 items of frame F visible. */
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 static int
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7393 tool_bar_lines_needed (f)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7394 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7395 {
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7396 struct window *w = XWINDOW (f->tool_bar_window);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7397 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7398
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7399 /* Initialize an iterator for iteration over
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7400 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
7401 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
7402 it.first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7403 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
7404 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
7405
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7406 while (!ITERATOR_AT_END_P (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7407 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7408 it.glyph_row = w->desired_matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7409 clear_glyph_row (it.glyph_row);
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7410 display_tool_bar_line (&it);
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7413 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
7414 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7415
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7416
35465
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7417 DEFUN ("tool-bar-lines-needed", Ftool_bar_lines_needed, Stool_bar_lines_needed,
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7418 0, 1, 0,
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7419 "Return the number of lines occupied by the tool bar of FRAME.")
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7420 (frame)
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7421 Lisp_Object frame;
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7422 {
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7423 struct frame *f;
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7424 struct window *w;
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7425 int nlines = 0;
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7426
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7427 if (NILP (frame))
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7428 frame = selected_frame;
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7429 else
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7430 CHECK_FRAME (frame, 0);
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7431 f = XFRAME (frame);
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7432
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7433 if (WINDOWP (f->tool_bar_window)
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7434 || (w = XWINDOW (f->tool_bar_window),
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7435 XFASTINT (w->height) > 0))
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7436 {
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7437 update_tool_bar (f, 1);
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7438 if (f->n_tool_bar_items)
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7439 {
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7440 build_desired_tool_bar_string (f);
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7441 nlines = tool_bar_lines_needed (f);
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7442 }
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7443 }
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7444
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7445 return make_number (nlines);
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7446 }
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7447
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
7448
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7449 /* 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
7450 height should be changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7451
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7452 static int
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7453 redisplay_tool_bar (f)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7454 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7455 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7456 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7457 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7458 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7459 int change_height_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7460
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7461 /* 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
7462 do anything. This means you must start with tool-bar-lines
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7463 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
7464 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
7465 if (!WINDOWP (f->tool_bar_window)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7466 || (w = XWINDOW (f->tool_bar_window),
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7467 XFASTINT (w->height) == 0))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7468 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7469
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7470 /* Set up an iterator for the tool-bar window. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7471 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
7472 it.first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7473 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7474 row = it.glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7475
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7476 /* 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
7477 build_desired_tool_bar_string (f);
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7478 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
7479
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7480 /* 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
7481 while (it.current_y < it.last_visible_y)
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7482 display_tool_bar_line (&it);
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7483
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7484 /* 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
7485 window, so don't do it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7486 w->desired_matrix->no_scrolling_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7487 w->must_be_updated_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7488
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7489 if (auto_resize_tool_bars_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7490 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7491 int nlines;
35357
bc6d69d139c6 (redisplay_tool_bar): Change tool bar's height when
Gerd Moellmann <gerd@gnu.org>
parents: 35334
diff changeset
7492
bc6d69d139c6 (redisplay_tool_bar): Change tool bar's height when
Gerd Moellmann <gerd@gnu.org>
parents: 35334
diff changeset
7493 /* If we couldn't display everything, change the tool-bar's
bc6d69d139c6 (redisplay_tool_bar): Change tool bar's height when
Gerd Moellmann <gerd@gnu.org>
parents: 35334
diff changeset
7494 height. */
bc6d69d139c6 (redisplay_tool_bar): Change tool bar's height when
Gerd Moellmann <gerd@gnu.org>
parents: 35334
diff changeset
7495 if (IT_STRING_CHARPOS (it) < it.end_charpos)
bc6d69d139c6 (redisplay_tool_bar): Change tool bar's height when
Gerd Moellmann <gerd@gnu.org>
parents: 35334
diff changeset
7496 change_height_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7497
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7498 /* If there are blank lines at the end, except for a partially
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7499 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
7500 CANON_Y_UNIT, change the tool-bar's height. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7501 row = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7502 if (!row->displays_text_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7503 && row->height >= CANON_Y_UNIT (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7504 change_height_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7505
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7506 /* If row displays tool-bar items, but is partially visible,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7507 change the tool-bar's height. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7508 if (row->displays_text_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7509 && MATRIX_ROW_BOTTOM_Y (row) > it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7510 change_height_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7511
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7512 /* Resize windows as needed by changing the `tool-bar-lines'
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7513 frame parameter. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7514 if (change_height_p
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7515 && (nlines = tool_bar_lines_needed (f),
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7516 nlines != XFASTINT (w->height)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7517 {
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7518 extern Lisp_Object Qtool_bar_lines;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7519 Lisp_Object frame;
33099
006a1f5b5f43 (redisplay_tool_bar): Don't set fonts_changed_p if
Gerd Moellmann <gerd@gnu.org>
parents: 33074
diff changeset
7520 int old_height = XFASTINT (w->height);
25012
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 XSETFRAME (frame, f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7523 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7524 Fmodify_frame_parameters (frame,
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7525 Fcons (Fcons (Qtool_bar_lines,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7526 make_number (nlines)),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7527 Qnil));
33099
006a1f5b5f43 (redisplay_tool_bar): Don't set fonts_changed_p if
Gerd Moellmann <gerd@gnu.org>
parents: 33074
diff changeset
7528 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
7529 fonts_changed_p = 1;
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7533 return change_height_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7534 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7535
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7536
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7537 /* 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
7538 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
7539 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
7540 GLYPH doesn't display a tool-bar item. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7541
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7542 int
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7543 tool_bar_item_info (f, glyph, prop_idx)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7544 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7545 struct glyph *glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7546 int *prop_idx;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7547 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7548 Lisp_Object prop;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7549 int success_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7550
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7551 /* Get the text property `menu-item' at pos. The value of that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7552 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
7553 F->tool_bar_items. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7554 prop = Fget_text_property (make_number (glyph->charpos),
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
7555 Qmenu_item, f->current_tool_bar_string);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7556 if (INTEGERP (prop))
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 *prop_idx = XINT (prop);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7559 success_p = 1;
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7562 success_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7563
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7564 return success_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7565 }
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 #endif /* HAVE_WINDOW_SYSTEM */
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7570
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 Horizontal scrolling
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7575 static int hscroll_window_tree P_ ((Lisp_Object));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7576 static int hscroll_windows P_ ((Lisp_Object));
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 /* 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
7579 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
7580 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
7581 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
7582 changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7583
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7584 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7585 hscroll_window_tree (window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7586 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7587 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7588 int hscrolled_p = 0;
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 while (WINDOWP (window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7591 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7592 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7593
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7594 if (WINDOWP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7595 hscrolled_p |= hscroll_window_tree (w->hchild);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7596 else if (WINDOWP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7597 hscrolled_p |= hscroll_window_tree (w->vchild);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7598 else if (w->cursor.vpos >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7599 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7600 int hscroll_margin, text_area_x, text_area_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7601 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
7602 struct glyph_row *current_cursor_row
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7603 = 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
7604 struct glyph_row *desired_cursor_row
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7605 = 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
7606 struct glyph_row *cursor_row
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7607 = (desired_cursor_row->enabled_p
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7608 ? desired_cursor_row
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7609 : current_cursor_row);
25012
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 window_box (w, TEXT_AREA, &text_area_x, &text_area_y,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7612 &text_area_width, &text_area_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7613
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7614 /* Scroll when cursor is inside this scroll margin. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7615 hscroll_margin = 5 * CANON_X_UNIT (XFRAME (w->frame));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7616
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7617 if ((XFASTINT (w->hscroll)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7618 && w->cursor.x < hscroll_margin)
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7619 || (cursor_row->enabled_p
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
7620 && cursor_row->truncated_on_right_p
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7621 && (w->cursor.x > text_area_width - hscroll_margin)))
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 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7624 int hscroll;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7625 struct buffer *saved_current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7626 int pt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7627
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7628 /* Find point in a display of infinite width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7629 saved_current_buffer = current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7630 current_buffer = XBUFFER (w->buffer);
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 if (w == XWINDOW (selected_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7633 pt = BUF_PT (current_buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7634 else
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 pt = marker_position (w->pointm);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7637 pt = max (BEGV, pt);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7638 pt = min (ZV, pt);
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 /* Move iterator to pt starting at cursor_row->start in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7642 a line with infinite width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7643 init_to_row_start (&it, w, cursor_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7644 it.last_visible_x = INFINITY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7645 move_it_in_display_line_to (&it, pt, -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7646 current_buffer = saved_current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7647
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7648 /* Center cursor in window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7649 hscroll = (max (0, it.current_x - text_area_width / 2)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7650 / CANON_X_UNIT (it.f));
34748
e978a3fb2690 (hscroll_window_tree): Take window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 34743
diff changeset
7651 hscroll = max (hscroll, XFASTINT (w->min_hscroll));
25012
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 /* Don't call Fset_window_hscroll if value hasn't
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7654 changed because it will prevent redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7655 optimizations. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7656 if (XFASTINT (w->hscroll) != hscroll)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7657 {
34748
e978a3fb2690 (hscroll_window_tree): Take window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 34743
diff changeset
7658 XBUFFER (w->buffer)->prevent_redisplay_optimizations_p = 1;
e978a3fb2690 (hscroll_window_tree): Take window's min_hscroll
Gerd Moellmann <gerd@gnu.org>
parents: 34743
diff changeset
7659 w->hscroll = make_number (hscroll);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7660 hscrolled_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7661 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7662 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7663 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7664
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7665 window = w->next;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7666 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7667
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7668 /* 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
7669 return hscrolled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7670 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7671
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7672
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7673 /* Set hscroll so that cursor is visible and not inside horizontal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7674 scroll margins for all windows in the tree rooted at WINDOW. See
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7675 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
7676 hscroll has been changed. If it has, desired matrices on the frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7677 of WINDOW are cleared. */
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 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7680 hscroll_windows (window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7681 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7682 {
28692
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7683 int hscrolled_p;
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7684
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7685 if (automatic_hscrolling_p)
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7686 {
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7687 hscrolled_p = hscroll_window_tree (window);
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7688 if (hscrolled_p)
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7689 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
7690 }
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7691 else
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
7692 hscrolled_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7693 return hscrolled_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7694 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7695
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7696
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7697
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7698 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7699 Redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7700 ************************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7701
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7702 /* Variables holding some state of redisplay if GLYPH_DEBUG is defined
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7703 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
7704 session. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7705
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7706 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7707
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7708 /* First and last unchanged row for try_window_id. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7709
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7710 int debug_first_unchanged_at_end_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7711 int debug_last_unchanged_at_beg_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7712
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7713 /* Delta vpos and y. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7714
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7715 int debug_dvpos, debug_dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7716
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7717 /* Delta in characters and bytes for try_window_id. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7718
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7719 int debug_delta, debug_delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7720
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7721 /* 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
7722 try_window_id. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7723
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7724 int debug_end_pos, debug_end_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7725
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7726 /* Append a string to W->desired_matrix->method. FMT is a printf
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7727 format string. A1...A9 are a supplement for a variable-length
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7728 argument list. If trace_redisplay_p is non-zero also printf the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7729 resulting string to stderr. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7730
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7731 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7732 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
7733 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7734 char *fmt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7735 int a1, a2, a3, a4, a5, a6, a7, a8, a9;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7736 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7737 char buffer[512];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7738 char *method = w->desired_matrix->method;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7739 int len = strlen (method);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7740 int size = sizeof w->desired_matrix->method;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7741 int remaining = size - len - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7742
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7743 sprintf (buffer, fmt, a1, a2, a3, a4, a5, a6, a7, a8, a9);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7744 if (len && remaining)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7745 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7746 method[len] = '|';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7747 --remaining, ++len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7748 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7749
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7750 strncpy (method + len, buffer, remaining);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7751
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7752 if (trace_redisplay_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7753 fprintf (stderr, "%p (%s): %s\n",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7754 w,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7755 ((BUFFERP (w->buffer)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7756 && STRINGP (XBUFFER (w->buffer)->name))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7757 ? (char *) XSTRING (XBUFFER (w->buffer)->name)->data
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7758 : "no buffer"),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7759 buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7760 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7761
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7762 #endif /* GLYPH_DEBUG */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7763
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7764
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7765 /* 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
7766 in redisplay_internal. It is incremented for each redisplay.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7767 Every CLEAR_FACE_CACHE_COUNT full redisplays, the face cache is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7768 cleared. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7769
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7770 #define CLEAR_FACE_CACHE_COUNT 10000
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7771 static int clear_face_cache_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7772
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7773 /* Record the previous terminal frame we displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7774
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7775 static struct frame *previous_terminal_frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7776
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7777 /* Non-zero while redisplay_internal is in progress. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7778
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7779 int redisplaying_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7780
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7781
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7782 /* Value is non-zero if all changes in window W, which displays
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7783 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
7784 buffer position, END is given as a distance from Z. Used in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7785 redisplay_internal for display optimization. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7786
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7787 static INLINE int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7788 text_outside_line_unchanged_p (w, start, end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7789 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7790 int start, end;
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 int unchanged_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7793
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7794 /* If text or overlays have changed, see where. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7795 if (XFASTINT (w->last_modified) < MODIFF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7796 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF)
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 /* Gap in the line? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7799 if (GPT < start || Z - GPT < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7800 unchanged_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7801
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7802 /* Changes start in front of the line, or end after it? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7803 if (unchanged_p
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7804 && (BEG_UNCHANGED < start - 1
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7805 || END_UNCHANGED < end))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7806 unchanged_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7807
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7808 /* If selective display, can't optimize if changes start at the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7809 beginning of the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7810 if (unchanged_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7811 && INTEGERP (current_buffer->selective_display)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7812 && XINT (current_buffer->selective_display) > 0
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7813 && (BEG_UNCHANGED < start || GPT <= start))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7814 unchanged_p = 0;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7817 return unchanged_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7818 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7819
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7820
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7821 /* Do a frame update, taking possible shortcuts into account. This is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7822 the main external entry point for redisplay.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7823
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7824 If the last redisplay displayed an echo area message and that message
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7825 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
7826 mini-buffer if that is in use. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7827
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7828 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7829 redisplay ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7830 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7831 redisplay_internal (0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7832 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7833
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7834 /* 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
7835 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
7836 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
7837
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7838 int
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7839 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
7840 struct buffer *prev_buf, *buf;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7841 int prev_pt, pt;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7842 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7843 int start, end;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7844 Lisp_Object prop;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7845 Lisp_Object buffer;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7846
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7847 XSETBUFFER (buffer, buf);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7848 /* 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
7849 same buffer. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7850 if (prev_buf == buf)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7851 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7852 if (prev_pt == pt)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7853 /* Point didn't move. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7854 return 0;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7855
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7856 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
7857 && 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
7858 && COMPOSITION_VALID_P (start, end, prop)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7859 && start < prev_pt && end > prev_pt)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7860 /* 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
7861 point moved out of the composition. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7862 return (pt <= start || pt >= end);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7863 }
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7864
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7865 /* Check a composition at the current point. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7866 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
7867 && 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
7868 && COMPOSITION_VALID_P (start, end, prop)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7869 && start < pt && end > pt);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7870 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7871
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7872 /* 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
7873 in window W. */
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7874
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7875 static INLINE void
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7876 reconsider_clip_changes (w, b)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7877 struct window *w;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7878 struct buffer *b;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7879 {
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7880 if (b->prevent_redisplay_optimizations_p)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7881 b->clip_changed = 1;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7882 else if (b->clip_changed
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7883 && !NILP (w->window_end_valid)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7884 && w->current_matrix->buffer == b
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7885 && w->current_matrix->zv == BUF_ZV (b)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7886 && w->current_matrix->begv == BUF_BEGV (b))
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7887 b->clip_changed = 0;
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7888
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7889 /* 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
7890 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
7891 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
7892 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
7893 check. */
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7894 if (!b->clip_changed
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7895 && 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
7896 {
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7897 int pt;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7898
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7899 if (w == XWINDOW (selected_window))
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7900 pt = BUF_PT (current_buffer);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7901 else
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7902 pt = marker_position (w->pointm);
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7903
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7904 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
7905 || pt != XINT (w->last_point))
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7906 && 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
7907 XINT (w->last_point),
26874
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7908 XBUFFER (w->buffer), pt))
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7909 b->clip_changed = 1;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
7910 }
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7911 }
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7912
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7913
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7914 /* 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
7915 response to any user action; therefore, we should preserve the echo
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7916 area. (Actually, our caller does that job.) Perhaps in the future
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7917 avoid recentering windows if it is not necessary; currently that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7918 causes some problems. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
7919
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7920 static void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7921 redisplay_internal (preserve_echo_area)
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
7922 int preserve_echo_area;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7923 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7924 struct window *w = XWINDOW (selected_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7925 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7926 int pause;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7927 int must_finish = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7928 struct text_pos tlbufpos, tlendpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7929 int number_of_visible_frames;
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7930 int count;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7931 struct frame *sf = SELECTED_FRAME ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7932
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7933 /* Non-zero means redisplay has to consider all windows on all
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7934 frames. Zero means, only selected_window is considered. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7935 int consider_all_windows_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7936
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7937 TRACE ((stderr, "redisplay_internal %d\n", redisplaying_p));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7938
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7939 /* 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
7940 initialized, or redisplay is explicitly turned off by setting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7941 Vinhibit_redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7942 if (noninteractive
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7943 || !NILP (Vinhibit_redisplay)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7944 || !f->glyphs_initialized_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7945 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7946
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7947 /* The flag redisplay_performed_directly_p is set by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7948 direct_output_for_insert when it already did the whole screen
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7949 update necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7950 if (redisplay_performed_directly_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7951 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7952 redisplay_performed_directly_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7953 if (!hscroll_windows (selected_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7954 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7955 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7956
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7957 #ifdef USE_X_TOOLKIT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7958 if (popup_activated ())
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7959 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7960 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7961
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7962 /* I don't think this happens but let's be paranoid. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7963 if (redisplaying_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7964 return;
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7965
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7966 /* 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
7967 when we leave this function. */
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
7968 count = BINDING_STACK_SIZE ();
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7969 record_unwind_protect (unwind_redisplay, make_number (redisplaying_p));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7970 ++redisplaying_p;
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
7971
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7972 retry:
31170
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
7973 pause = 0;
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7974 reconsider_clip_changes (w, current_buffer);
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
7975
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7976 /* If new fonts have been loaded that make a glyph matrix adjustment
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7977 necessary, do it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7978 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7979 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7980 adjust_glyphs (NULL);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7981 ++windows_or_buffers_changed;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7982 fonts_changed_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7983 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7984
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7985 if (! FRAME_WINDOW_P (sf)
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7986 && previous_terminal_frame != sf)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7987 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7988 /* Since frames on an ASCII terminal share the same display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7989 area, displaying a different frame means redisplay the whole
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7990 thing. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7991 windows_or_buffers_changed++;
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7992 SET_FRAME_GARBAGED (sf);
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7993 XSETFRAME (Vterminal_frame, sf);
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7994 }
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
7995 previous_terminal_frame = sf;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7996
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7997 /* Set the visible flags for all frames. Do this before checking
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7998 for resized or garbaged frames; they want to know if their frames
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
7999 are visible. See the comment in frame.h for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8000 FRAME_SAMPLE_VISIBILITY. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8001 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8002 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8003
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8004 number_of_visible_frames = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8005
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8006 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8007 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8008 struct frame *f = XFRAME (frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8009
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8010 FRAME_SAMPLE_VISIBILITY (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8011 if (FRAME_VISIBLE_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8012 ++number_of_visible_frames;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8013 clear_desired_matrices (f);
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 }
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 /* 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
8018 do_pending_window_change (1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8019
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8020 /* Clear frames marked as garbaged. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8021 if (frame_garbaged)
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8022 clear_garbaged_frames ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8023
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
8024 /* Build menubar and tool-bar items. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8025 prepare_menu_bars ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8026
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8027 if (windows_or_buffers_changed)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8028 update_mode_lines++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8029
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8030 /* 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
8031 if ((SAVE_MODIFF < MODIFF) != !NILP (w->last_had_star))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8032 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8033 w->update_mode_line = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8034 if (buffer_shared > 1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8035 update_mode_lines++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8036 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8037
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8038 /* If %c is in the mode line, update it if needed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8039 if (!NILP (w->column_number_displayed)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8040 /* This alternative quickly identifies a common case
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8041 where no change is needed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8042 && !(PT == XFASTINT (w->last_point)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8043 && XFASTINT (w->last_modified) >= MODIFF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8044 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8045 && XFASTINT (w->column_number_displayed) != current_column ())
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8046 w->update_mode_line = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8047
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8048 FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8049
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8050 /* The variable buffer_shared is set in redisplay_window and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8051 indicates that we redisplay a buffer in different windows. See
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8052 there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8053 consider_all_windows_p = update_mode_lines || buffer_shared > 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8054
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8055 /* If specs for an arrow have changed, do thorough redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8056 to ensure we remove any arrow that should no longer exist. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8057 if (! EQ (COERCE_MARKER (Voverlay_arrow_position), last_arrow_position)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8058 || ! EQ (Voverlay_arrow_string, last_arrow_string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8059 consider_all_windows_p = windows_or_buffers_changed = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8060
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8061 /* Normally the message* functions will have already displayed and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8062 updated the echo area, but the frame may have been trashed, or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8063 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
8064 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
8065 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
8066 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
8067 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8068 int window_height_changed_p = echo_area_display (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8069 must_finish = 1;
25362
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
8070
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8071 if (fonts_changed_p)
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8072 goto retry;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8073 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
8074 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8075 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
8076 ++update_mode_lines;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8077 ++windows_or_buffers_changed;
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8078
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8079 /* 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
8080 marked garbaged. Clear them or we will experience
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8081 surprises wrt scrolling. */
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8082 if (frame_garbaged)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8083 clear_garbaged_frames ();
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8084 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8085 }
30942
8f6621d33f0b (redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents: 30761
diff changeset
8086 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
8087 && (current_buffer->clip_changed
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
8088 || 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
8089 || 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
8090 && 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
8091 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8092 /* 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
8093 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
8094 must_finish = 1;
4b8bf7aa0497 (resize_mini_window): Do it for truncate-lines t as
Gerd Moellmann <gerd@gnu.org>
parents: 25358
diff changeset
8095 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
8096 ++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
8097 ++update_mode_lines;
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8098
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8099 /* 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
8100 marked garbaged. Clear them or we will experience
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8101 surprises wrt scrolling. */
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8102 if (frame_garbaged)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8103 clear_garbaged_frames ();
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8104 }
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8105
25012
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 /* If showing the region, and mark has changed, we must redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8108 the whole window. The assignment to this_line_start_pos prevents
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8109 the optimization directly below this if-statement. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8110 if (((!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8111 && !NILP (XBUFFER (w->buffer)->mark_active))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8112 != !NILP (w->region_showing))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8113 || (!NILP (w->region_showing)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8114 && !EQ (w->region_showing,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8115 Fmarker_position (XBUFFER (w->buffer)->mark))))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8116 CHARPOS (this_line_start_pos) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8117
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8118 /* Optimize the case that only the line containing the cursor in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8119 selected window has changed. Variables starting with this_ are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8120 set in display_line and record information about the line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8121 containing the cursor. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8122 tlbufpos = this_line_start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8123 tlendpos = this_line_end_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8124 if (!consider_all_windows_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8125 && CHARPOS (tlbufpos) > 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8126 && NILP (w->update_mode_line)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8127 && !current_buffer->clip_changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8128 && FRAME_VISIBLE_P (XFRAME (w->frame))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8129 && !FRAME_OBSCURED_P (XFRAME (w->frame))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8130 /* Make sure recorded data applies to current buffer, etc. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8131 && this_line_buffer == current_buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8132 && current_buffer == XBUFFER (w->buffer)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8133 && NILP (w->force_start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8134 /* Point must be on the line that we have info recorded about. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8135 && PT >= CHARPOS (tlbufpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8136 && PT <= Z - CHARPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8137 /* All text outside that line, including its final newline,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8138 must be unchanged */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8139 && text_outside_line_unchanged_p (w, CHARPOS (tlbufpos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8140 CHARPOS (tlendpos)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8141 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8142 if (CHARPOS (tlbufpos) > BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8143 && FETCH_BYTE (BYTEPOS (tlbufpos) - 1) != '\n'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8144 && (CHARPOS (tlbufpos) == ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8145 || FETCH_BYTE (BYTEPOS (tlbufpos)) == '\n'))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8146 /* Former continuation line has disappeared by becoming empty */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8147 goto cancel;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8148 else if (XFASTINT (w->last_modified) < MODIFF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8149 || XFASTINT (w->last_overlay_modified) < OVERLAY_MODIFF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8150 || MINI_WINDOW_P (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8151 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8152 /* We have to handle the case of continuation around a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8153 wide-column character (See the comment in indent.c around
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8154 line 885).
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8155
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8156 For instance, in the following case:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8157
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8158 -------- Insert --------
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8159 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
8160 J_I_ ==> J_I_ `^^' are cursors.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8161 ^^ ^^
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8162 -------- --------
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8163
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8164 As we have to redraw the line above, we should goto cancel. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8165
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8166 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8167 int line_height_before = this_line_pixel_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8168
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8169 /* Note that start_display will handle the case that the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8170 line starting at tlbufpos is a continuation lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8171 start_display (&it, w, tlbufpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8172
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8173 /* Implementation note: It this still necessary? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8174 if (it.current_x != this_line_start_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8175 goto cancel;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8176
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8177 TRACE ((stderr, "trying display optimization 1\n"));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8178 w->cursor.vpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8179 overlay_arrow_seen = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8180 it.vpos = this_line_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8181 it.current_y = this_line_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8182 it.glyph_row = MATRIX_ROW (w->desired_matrix, this_line_vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8183 display_line (&it);
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 /* If line contains point, is not continued,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8186 and ends at same distance from eob as before, we win */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8187 if (w->cursor.vpos >= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8188 /* Line is not continued, otherwise this_line_start_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8189 would have been set to 0 in display_line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8190 && CHARPOS (this_line_start_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8191 /* Line ends as before. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8192 && CHARPOS (this_line_end_pos) == CHARPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8193 /* Line has same height as before. Otherwise other lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8194 would have to be shifted up or down. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8195 && this_line_pixel_height == line_height_before)
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 /* If this is not the window's last line, we must adjust
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8198 the charstarts of the lines below. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8199 if (it.current_y < it.last_visible_y)
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 struct glyph_row *row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8202 = MATRIX_ROW (w->current_matrix, this_line_vpos + 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8203 int delta, delta_bytes;
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 if (Z - CHARPOS (tlendpos) == ZV)
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 /* This line ends at end of (accessible part of)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8208 buffer. There is no newline to count. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8209 delta = (Z
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8210 - CHARPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8211 - MATRIX_ROW_START_CHARPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8212 delta_bytes = (Z_BYTE
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8213 - BYTEPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8214 - MATRIX_ROW_START_BYTEPOS (row));
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8217 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8218 /* This line ends in a newline. Must take
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8219 account of the newline and the rest of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8220 text that follows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8221 delta = (Z
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8222 - CHARPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8223 - MATRIX_ROW_START_CHARPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8224 delta_bytes = (Z_BYTE
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8225 - BYTEPOS (tlendpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8226 - MATRIX_ROW_START_BYTEPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8227 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8228
28709
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
8229 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
8230 this_line_vpos + 1,
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
8231 w->current_matrix->nrows,
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
8232 delta, delta_bytes);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8233 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8234
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8235 /* If this row displays text now but previously didn't,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8236 or vice versa, w->window_end_vpos may have to be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8237 adjusted. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8238 if ((it.glyph_row - 1)->displays_text_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8239 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8240 if (XFASTINT (w->window_end_vpos) < this_line_vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8241 XSETINT (w->window_end_vpos, this_line_vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8242 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8243 else if (XFASTINT (w->window_end_vpos) == this_line_vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8244 && this_line_vpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8245 XSETINT (w->window_end_vpos, this_line_vpos - 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8246 w->window_end_valid = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8247
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8248 /* Update hint: No need to try to scroll in update_window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8249 w->desired_matrix->no_scrolling_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8250
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8251 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8252 *w->desired_matrix->method = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8253 debug_method_add (w, "optimization 1");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8254 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8255 goto update;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8256 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8257 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8258 goto cancel;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8259 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8260 else if (/* Cursor position hasn't changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8261 PT == XFASTINT (w->last_point)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8262 /* Make sure the cursor was last displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8263 in this window. Otherwise we have to reposition it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8264 && 0 <= w->cursor.vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8265 && XINT (w->height) > w->cursor.vpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8266 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8267 if (!must_finish)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8268 {
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8269 do_pending_window_change (1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8270
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8271 /* We used to always goto end_of_redisplay here, but this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8272 isn't enough if we have a blinking cursor. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8273 if (w->cursor_off_p == w->last_cursor_off_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8274 goto end_of_redisplay;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8275 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8276 goto update;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8277 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8278 /* 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
8279 then we can't just move the cursor. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8280 else if (! (!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8281 && !NILP (current_buffer->mark_active))
30942
8f6621d33f0b (redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents: 30761
diff changeset
8282 && (EQ (selected_window, current_buffer->last_selected_window)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8283 || highlight_nonselected_windows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8284 && NILP (w->region_showing)
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
8285 && NILP (Vshow_trailing_whitespace)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8286 && !cursor_in_echo_area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8287 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8288 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8289 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8290
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8291 /* Skip from tlbufpos to PT and see where it is. Note that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8292 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
8293 next visible position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8294 init_iterator (&it, w, CHARPOS (tlbufpos), BYTEPOS (tlbufpos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8295 NULL, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8296 it.current_x = this_line_start_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8297 it.current_y = this_line_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8298 it.vpos = this_line_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8299
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8300 /* The call to move_it_to stops in front of PT, but
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8301 moves over before-strings. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8302 move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8303
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8304 if (it.vpos == this_line_vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8305 && (row = MATRIX_ROW (w->current_matrix, this_line_vpos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8306 row->enabled_p))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8307 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8308 xassert (this_line_vpos == it.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8309 xassert (this_line_y == it.current_y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8310 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
8311 goto update;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8312 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8313 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8314 goto cancel;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8315 }
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 cancel:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8318 /* Text changed drastically or point moved off of line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8319 SET_MATRIX_ROW_ENABLED_P (w->desired_matrix, this_line_vpos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8320 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8321
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8322 CHARPOS (this_line_start_pos) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8323 consider_all_windows_p |= buffer_shared > 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8324 ++clear_face_cache_count;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8325
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8326
31170
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8327 /* 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
8328 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
8329 frames. Otherwise do it for selected_window, only. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8330
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8331 if (consider_all_windows_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8332 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8333 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8334
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8335 /* Clear the face cache eventually. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8336 if (clear_face_cache_count > CLEAR_FACE_CACHE_COUNT)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8337 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8338 clear_face_cache (0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8339 clear_face_cache_count = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8340 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8341
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8342 /* Recompute # windows showing selected buffer. This will be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8343 incremented each time such a window is displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8344 buffer_shared = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8345
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8346 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8347 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8348 struct frame *f = XFRAME (frame);
31170
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8349
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
8350 if (FRAME_WINDOW_P (f) || f == sf)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8351 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8352 /* Mark all the scroll bars to be removed; we'll redeem
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8353 the ones we want when we redisplay their windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8354 if (condemn_scroll_bars_hook)
34844
4756a759c825 (syms_of_xdisp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34802
diff changeset
8355 condemn_scroll_bars_hook (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8356
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8357 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8358 redisplay_windows (FRAME_ROOT_WINDOW (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8359
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8360 /* Any scroll bars which redisplay_windows should have
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8361 nuked should now go away. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8362 if (judge_scroll_bars_hook)
34844
4756a759c825 (syms_of_xdisp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34802
diff changeset
8363 judge_scroll_bars_hook (f);
31170
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8364
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8365 /* If fonts changed, display again. */
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8366 if (fonts_changed_p)
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8367 goto retry;
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8368
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8369 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
8370 {
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8371 /* See if we have to hscroll. */
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8372 if (hscroll_windows (f->root_window))
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8373 goto retry;
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8374
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8375 /* 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
8376 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
8377 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
8378 error. */
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8379 if (interrupt_input)
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8380 unrequest_sigio ();
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8381 stop_polling ();
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8382
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8383 /* Update the display. */
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8384 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
8385 pause |= update_frame (f, 0, 0);
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8386 if (pause)
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8387 break;
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8388
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8389 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
8390 if (frame_up_to_date_hook)
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8391 frame_up_to_date_hook (f);
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8392 }
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8393 }
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8394 }
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8395 }
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8396 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
8397 {
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8398 Lisp_Object mini_window;
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8399 struct frame *mini_frame;
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8400
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8401 redisplay_window (selected_window, 1);
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8402
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8403 /* 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
8404 update:
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8405
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8406 /* If fonts changed, display again. */
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8407 if (fonts_changed_p)
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
8408 goto retry;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8409
31170
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8410 /* 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
8411 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
8412 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
8413 if (interrupt_input)
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8414 unrequest_sigio ();
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8415 stop_polling ();
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8416
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8417 if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8418 {
25660
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
8419 if (hscroll_windows (selected_window))
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
8420 goto retry;
0072098f54df (resize_mini_window): Add parameter exact_p. Resize
Gerd Moellmann <gerd@gnu.org>
parents: 25643
diff changeset
8421
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8422 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
8423 pause = update_frame (sf, 0, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8424 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8425
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8426 /* We may have called echo_area_display at the top of this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8427 function. If the echo area is on another frame, that may
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8428 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
8429 above call to update_frame would not have caught it. Catch
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8430 it here. */
31170
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8431 mini_window = FRAME_MINIBUF_WINDOW (sf);
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8432 mini_frame = XFRAME (WINDOW_FRAME (XWINDOW (mini_window)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8433
31170
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8434 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
8435 {
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8436 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
8437 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
8438 if (!pause && hscroll_windows (mini_window))
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8439 goto retry;
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
8440 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8441 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8442
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8443 /* 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
8444 thorough update the next time. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8445 if (pause)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8446 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8447 /* Prevent the optimization at the beginning of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8448 redisplay_internal that tries a single-line update of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8449 line containing the cursor in the selected window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8450 CHARPOS (this_line_start_pos) = 0;
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 /* Let the overlay arrow be updated the next time. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8453 if (!NILP (last_arrow_position))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8454 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8455 last_arrow_position = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8456 last_arrow_string = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8457 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8458
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8459 /* If we pause after scrolling, some rows in the current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8460 matrices of some windows are not valid. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8461 if (!WINDOW_FULL_WIDTH_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8462 && !FRAME_WINDOW_P (XFRAME (w->frame)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8463 update_mode_lines = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8464 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8465
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8466 /* Now text on frame agrees with windows, so put info into the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8467 windows for partial redisplay to follow. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8468 if (!pause)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8469 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8470 register struct buffer *b = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8471
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8472 BUF_UNCHANGED_MODIFIED (b) = BUF_MODIFF (b);
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8473 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
8474 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
8475 BUF_END_UNCHANGED (b) = BUF_Z (b) - BUF_GPT (b);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8476
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8477 if (consider_all_windows_p)
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
8478 mark_window_display_accurate (FRAME_ROOT_WINDOW (sf), 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8479 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8480 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8481 XSETFASTINT (w->last_point, BUF_PT (b));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8482 w->last_cursor = w->cursor;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8483 w->last_cursor_off_p = w->cursor_off_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8484
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8485 b->clip_changed = 0;
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8486 b->prevent_redisplay_optimizations_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8487 w->update_mode_line = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8488 XSETFASTINT (w->last_modified, BUF_MODIFF (b));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8489 XSETFASTINT (w->last_overlay_modified, BUF_OVERLAY_MODIFF (b));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8490 w->last_had_star
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8491 = (BUF_MODIFF (XBUFFER (w->buffer)) > BUF_SAVE_MODIFF (XBUFFER (w->buffer))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8492 ? Qt : Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8493
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8494 /* Record if we are showing a region, so can make sure to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8495 update it fully at next redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8496 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
8497 && (EQ (selected_window,
8f6621d33f0b (redisplay_internal): Compare windows for equality with
Gerd Moellmann <gerd@gnu.org>
parents: 30761
diff changeset
8498 current_buffer->last_selected_window)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8499 || highlight_nonselected_windows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8500 && !NILP (XBUFFER (w->buffer)->mark_active)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8501 ? Fmarker_position (XBUFFER (w->buffer)->mark)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8502 : Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8503
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8504 w->window_end_valid = w->buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8505 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8506 last_arrow_string = Voverlay_arrow_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8507 if (frame_up_to_date_hook != 0)
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
8508 (*frame_up_to_date_hook) (sf);
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8509
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 }
28206
07ac059dece0 (handle_single_display_prop): Initialize local `value'.
Gerd Moellmann <gerd@gnu.org>
parents: 28047
diff changeset
8514
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8515 update_mode_lines = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8516 windows_or_buffers_changed = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8517 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8518
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8519 /* Start SIGIO interrupts coming again. Having them off during the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8520 code above makes it less likely one will discard output, but not
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8521 impossible, since there might be stuff in the system buffer here.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8522 But it is much hairier to try to do anything about that. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8523 if (interrupt_input)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8524 request_sigio ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8525 start_polling ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8526
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8527 /* If a frame has become visible which was not before, redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8528 again, so that we display it. Expose events for such a frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8529 (which it gets when becoming visible) don't call the parts of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8530 redisplay constructing glyphs, so simply exposing a frame won't
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8531 display anything in this case. So, we have to display these
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8532 frames here explicitly. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8533 if (!pause)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8534 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8535 Lisp_Object tail, frame;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8536 int new_count = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8537
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8538 FOR_EACH_FRAME (tail, frame)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8539 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8540 int this_is_visible = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8541
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8542 if (XFRAME (frame)->visible)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8543 this_is_visible = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8544 FRAME_SAMPLE_VISIBILITY (XFRAME (frame));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8545 if (XFRAME (frame)->visible)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8546 this_is_visible = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8547
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8548 if (this_is_visible)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8549 new_count++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8550 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8551
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8552 if (new_count != number_of_visible_frames)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8553 windows_or_buffers_changed++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8554 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8555
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8556 /* 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
8557 do_pending_window_change (1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8558
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8559 /* If we just did a pending size change, or have additional
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8560 visible frames, redisplay again. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8561 if (windows_or_buffers_changed && !pause)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8562 goto retry;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8563
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8564 end_of_redisplay:;
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8565
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8566 unbind_to (count, Qnil);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8567 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8570 /* Redisplay, but leave alone any recent echo area message unless
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8571 another message has been requested in its place.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8572
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8573 This is useful in situations where you need to redisplay but no
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8574 user action has occurred, making it inappropriate for the message
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8575 area to be cleared. See tracking_off and
35334
7cf24bda5ab7 (redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents: 35301
diff changeset
8576 wait_reading_process_input for examples of these situations.
7cf24bda5ab7 (redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents: 35301
diff changeset
8577
7cf24bda5ab7 (redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents: 35301
diff changeset
8578 FROM_WHERE is an integer saying from where this function was
7cf24bda5ab7 (redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents: 35301
diff changeset
8579 called. This is useful for debugging. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8580
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8581 void
35334
7cf24bda5ab7 (redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents: 35301
diff changeset
8582 redisplay_preserve_echo_area (from_where)
7cf24bda5ab7 (redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents: 35301
diff changeset
8583 int from_where;
7cf24bda5ab7 (redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents: 35301
diff changeset
8584 {
7cf24bda5ab7 (redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents: 35301
diff changeset
8585 TRACE ((stderr, "redisplay_preserve_echo_area (%d)\n", from_where));
7cf24bda5ab7 (redisplay_preserve_echo_area): Add parameter
Gerd Moellmann <gerd@gnu.org>
parents: 35301
diff changeset
8586
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8587 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
8588 {
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8589 /* 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
8590 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
8591 display_last_displayed_message_p = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8592 redisplay_internal (1);
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
8593 display_last_displayed_message_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8594 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8595 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8596 redisplay_internal (1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8597 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8598
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8599
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8600 /* Function registered with record_unwind_protect in
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8601 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
8602 in progress. */
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8603
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8604 static Lisp_Object
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8605 unwind_redisplay (old_redisplaying_p)
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8606 Lisp_Object old_redisplaying_p;
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8607 {
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8608 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
8609 return Qnil;
25316
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8610 }
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8611
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
8612
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8613 /* 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
8614 accurate or inaccurate. If FLAG is non-zero mark display of WINDOW
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8615 as accurate. If FLAG is zero arrange for WINDOW to be redisplayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8616 the next time redisplay_internal is called. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8617
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8618 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8619 mark_window_display_accurate (window, accurate_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8620 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8621 int accurate_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8622 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8623 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8624
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8625 for (; !NILP (window); window = w->next)
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 w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8628
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8629 if (BUFFERP (w->buffer))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8630 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8631 struct buffer *b = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8632
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8633 XSETFASTINT (w->last_modified,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8634 accurate_p ? BUF_MODIFF (b) : 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8635 XSETFASTINT (w->last_overlay_modified,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8636 accurate_p ? BUF_OVERLAY_MODIFF (b) : 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8637 w->last_had_star = (BUF_MODIFF (b) > BUF_SAVE_MODIFF (b)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8638 ? Qt : Qnil);
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 #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
8641 Let's check it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8642 /* Record if we are showing a region, so can make sure to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8643 update it fully at next redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8644 w->region_showing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8645 = (!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8646 && (w == XWINDOW (current_buffer->last_selected_window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8647 || highlight_nonselected_windows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8648 && (!NILP (b->mark_active)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8649 ? Fmarker_position (b->mark)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8650 : Qnil));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8651 #endif
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 if (accurate_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8654 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8655 b->clip_changed = 0;
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8656 b->prevent_redisplay_optimizations_p = 0;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8657 w->current_matrix->buffer = b;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8658 w->current_matrix->begv = BUF_BEGV (b);
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
8659 w->current_matrix->zv = BUF_ZV (b);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8660 w->last_cursor = w->cursor;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8661 w->last_cursor_off_p = w->cursor_off_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8662 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
8663 w->last_point = make_number (BUF_PT (b));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8664 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
8665 w->last_point = make_number (XMARKER (w->pointm)->charpos);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8666 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8667 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8668
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8669 w->window_end_valid = w->buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8670 w->update_mode_line = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8671
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8672 if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8673 mark_window_display_accurate (w->vchild, accurate_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8674 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8675 mark_window_display_accurate (w->hchild, accurate_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8676 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8677
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8678 if (accurate_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8679 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8680 last_arrow_position = COERCE_MARKER (Voverlay_arrow_position);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8681 last_arrow_string = Voverlay_arrow_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8682 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8683 else
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 /* Force a thorough redisplay the next time by setting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8686 last_arrow_position and last_arrow_string to t, which is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8687 unequal to any useful value of Voverlay_arrow_... */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8688 last_arrow_position = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8689 last_arrow_string = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8690 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8691 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8692
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8693
17317
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8694 /* 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
8695 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
8696 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
8697 macro DISP_CHAR_VECTOR. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8698
17317
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8699 Lisp_Object
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8700 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
8701 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
8702 int c;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8703 {
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8704 int code[4], i;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8705 Lisp_Object val;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8706
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8707 if (SINGLE_BYTE_CHAR_P (c))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8708 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
8709
29023
af50e87cc257 (get_next_display_element): Handle 8-bit characters
Kenichi Handa <handa@m17n.org>
parents: 28984
diff changeset
8710 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
8711 if (code[1] < 32)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
8712 code[1] = -1;
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
8713 else if (code[2] < 32)
e45f9a84fca0 (it_props): Add an entry for composition.
Kenichi Handa <handa@m17n.org>
parents: 26570
diff changeset
8714 code[2] = -1;
25012
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 /* Here, the possible range of code[0] (== charset ID) is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8717 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
8718 for multibyte characters after 256th element, we must increment
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8719 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
8720 code[0] += 128;
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8721 code[3] = -1; /* anchor */
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8722
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8723 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
8724 {
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8725 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
8726 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
8727 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
8728 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8729
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8730 /* 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
8731 it. */
17317
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8732 return (dp->defalt);
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8733 }
51b7fded4356 (disp_char_vector): New function to be used from the
Kenichi Handa <handa@m17n.org>
parents: 17179
diff changeset
8734
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8735
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8736
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8737 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8738 Window Redisplay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8739 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8740
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8741 /* Redisplay all leaf windows in the window tree rooted at WINDOW. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8742
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8743 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8744 redisplay_windows (window)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8745 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8746 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8747 while (!NILP (window))
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 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8750
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8751 if (!NILP (w->hchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8752 redisplay_windows (w->hchild);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8753 else if (!NILP (w->vchild))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8754 redisplay_windows (w->vchild);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8755 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8756 redisplay_window (window, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8757
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8758 window = w->next;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8759 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8760 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8761
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8762
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8763 /* 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
8764 DELTA is the number of bytes by which positions recorded in ROW
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8765 differ from current buffer positions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8766
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8767 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8768 set_cursor_from_row (w, row, matrix, delta, delta_bytes, dy, dvpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8769 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8770 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8771 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8772 int delta, delta_bytes, dy, dvpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8773 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8774 struct glyph *glyph = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8775 struct glyph *end = glyph + row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8776 int x = row->x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8777 int pt_old = PT - delta;
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 /* 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
8780 These are special glyphs like truncation marks on terminal
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8781 frames. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8782 if (row->displays_text_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8783 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
8784 && INTEGERP (glyph->object)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8785 && glyph->charpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8786 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8787 x += glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8788 ++glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8789 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8790
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8791 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
8792 && !INTEGERP (glyph->object)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8793 && (!BUFFERP (glyph->object)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8794 || glyph->charpos < pt_old))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8795 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8796 x += glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8797 ++glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8798 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8799
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8800 w->cursor.hpos = glyph - row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8801 w->cursor.x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8802 w->cursor.vpos = MATRIX_ROW_VPOS (row, matrix) + dvpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8803 w->cursor.y = row->y + dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8804
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8805 if (w == XWINDOW (selected_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8806 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8807 if (!row->continued_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8808 && !MATRIX_ROW_CONTINUATION_LINE_P (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8809 && row->x == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8810 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8811 this_line_buffer = XBUFFER (w->buffer);
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 CHARPOS (this_line_start_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8814 = MATRIX_ROW_START_CHARPOS (row) + delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8815 BYTEPOS (this_line_start_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8816 = MATRIX_ROW_START_BYTEPOS (row) + delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8817
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8818 CHARPOS (this_line_end_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8819 = Z - (MATRIX_ROW_END_CHARPOS (row) + delta);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8820 BYTEPOS (this_line_end_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8821 = Z_BYTE - (MATRIX_ROW_END_BYTEPOS (row) + delta_bytes);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8822
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8823 this_line_y = w->cursor.y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8824 this_line_pixel_height = row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8825 this_line_vpos = w->cursor.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8826 this_line_start_x = row->x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8827 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8828 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8829 CHARPOS (this_line_start_pos) = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8830 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8831 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8832
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8833
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8834 /* 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
8835 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
8836
385bf7dbf253 (run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents: 25614
diff changeset
8837 We assume that the window's buffer is really current. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8838
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8839 static INLINE struct text_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8840 run_window_scroll_functions (window, startp)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8841 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8842 struct text_pos startp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8843 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8844 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8845 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
8846
385bf7dbf253 (run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents: 25614
diff changeset
8847 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
8848 abort ();
385bf7dbf253 (run_window_scroll_functions): If hook functions switch
Richard M. Stallman <rms@gnu.org>
parents: 25614
diff changeset
8849
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8850 if (!NILP (Vwindow_scroll_functions))
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 run_hook_with_args_2 (Qwindow_scroll_functions, window,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8853 make_number (CHARPOS (startp)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8854 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
8855 /* 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
8856 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
8857 set_buffer_internal_1 (XBUFFER (w->buffer));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8858 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8859
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8860 return startp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8861 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8862
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8863
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8864 /* 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
8865 line containing the cursor is fully visible. */
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
8866
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8867 static void
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8868 make_cursor_line_fully_visible (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8869 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8870 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8871 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8872 struct glyph_row *row;
34987
cf1115a9c758 (make_cursor_line_fully_visible): Remove unused variable
Eli Zaretskii <eliz@gnu.org>
parents: 34947
diff changeset
8873 int window_height;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8874
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8875 /* 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
8876 is full of overlay strings. Don't do anything in that case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8877 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8878 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8879
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8880 matrix = w->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8881 row = MATRIX_ROW (matrix, w->cursor.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8882
30652
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8883 /* 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
8884 to do. */
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8885 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
8886 return;
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8887
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8888 /* 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
8889 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
8890 window_height = window_box_height (w);
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8891 if (row->height >= window_height)
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8892 return;
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8893
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8894 if (MATRIX_ROW_PARTIALLY_VISIBLE_AT_TOP_P (w, row))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8895 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8896 int dy = row->height - row->visible_height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8897 w->vscroll = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8898 w->cursor.y += dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8899 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8900 }
30652
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8901 else /* MATRIX_ROW_PARTIALLY_VISIBLE_AT_BOTTOM_P (w, row)) */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8902 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8903 int dy = - (row->height - row->visible_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8904 w->vscroll = dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8905 w->cursor.y += dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8906 shift_glyph_matrix (w, matrix, 0, matrix->nrows, dy);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8907 }
30652
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
8908
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8909 /* When we change the cursor y-position of the selected window,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8910 change this_line_y as well so that the display optimization for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8911 the cursor line of the selected window in redisplay_internal uses
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8912 the correct y-position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8913 if (w == XWINDOW (selected_window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8914 this_line_y = w->cursor.y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8915 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8916
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 /* Try scrolling PT into view in window WINDOW. JUST_THIS_ONE_P
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8919 non-zero means only WINDOW is redisplayed in redisplay_internal.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8920 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
8921 in redisplay_window to bring a partially visible line into view in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8922 the case that only the cursor has moved.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8923
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8924 Value is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8925
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8926 1 if scrolling succeeded
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8927
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8928 0 if scrolling didn't find point.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8929
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8930 -1 if new fonts have been loaded so that we must interrupt
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8931 redisplay, adjust glyph matrices, and try again. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8932
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8933 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8934 try_scrolling (window, just_this_one_p, scroll_conservatively,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8935 scroll_step, temp_scroll_step)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8936 Lisp_Object window;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8937 int just_this_one_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8938 int scroll_conservatively, scroll_step;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8939 int temp_scroll_step;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8940 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8941 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8942 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8943 struct text_pos scroll_margin_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8944 struct text_pos pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8945 struct text_pos startp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8946 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8947 Lisp_Object window_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8948 int this_scroll_margin;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8949 int dy = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8950 int scroll_max;
32532
61d4de9a4e35 (try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents: 32460
diff changeset
8951 int rc;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8952 int amount_to_scroll = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8953 Lisp_Object aggressive;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8954 int height;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8955
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8956 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8957 debug_method_add (w, "try_scrolling");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8958 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8959
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8960 SET_TEXT_POS_FROM_MARKER (startp, w->start);
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 /* Compute scroll margin height in pixels. We scroll when point is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8963 within this distance from the top or bottom of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8964 if (scroll_margin > 0)
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 this_scroll_margin = min (scroll_margin, XINT (w->height) / 4);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8967 this_scroll_margin *= CANON_Y_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8968 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8969 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8970 this_scroll_margin = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8971
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8972 /* Compute how much we should try to scroll maximally to bring point
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8973 into view. */
33490
b714a06b99ec (try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33462
diff changeset
8974 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
8975 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
8976 max (scroll_conservatively, temp_scroll_step));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8977 else if (NUMBERP (current_buffer->scroll_down_aggressively)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8978 || NUMBERP (current_buffer->scroll_up_aggressively))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8979 /* We're trying to scroll because of aggressive scrolling
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8980 but no scroll_step is set. Choose an arbitrary one. Maybe
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8981 there should be a variable for this. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8982 scroll_max = 10;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8983 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8984 scroll_max = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8985 scroll_max *= CANON_Y_UNIT (f);
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 /* Decide whether we have to scroll down. Start at the window end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8988 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
8989 margin. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8990 window_end = Fwindow_end (window, Qt);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8991 CHARPOS (scroll_margin_pos) = XINT (window_end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8992 BYTEPOS (scroll_margin_pos) = CHAR_TO_BYTE (CHARPOS (scroll_margin_pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8993 if (this_scroll_margin)
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 start_display (&it, w, scroll_margin_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8996 move_it_vertically (&it, - this_scroll_margin);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8997 scroll_margin_pos = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8998 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
8999
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9000 if (PT >= CHARPOS (scroll_margin_pos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9001 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9002 int y0;
32532
61d4de9a4e35 (try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents: 32460
diff changeset
9003 #if 0
61d4de9a4e35 (try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents: 32460
diff changeset
9004 int line_height;
61d4de9a4e35 (try_scrolling) <cursor in scroll margin at the bottom>:
Gerd Moellmann <gerd@gnu.org>
parents: 32460
diff changeset
9005 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9006
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9007 /* 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
9008 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
9009
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9010 /* Compute the distance from the scroll margin to PT.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9011 Give up if the distance is greater than scroll_max. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9012 start_display (&it, w, scroll_margin_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9013 y0 = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9014 move_it_to (&it, PT, 0, it.last_visible_y, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9015 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
9016 #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
9017 line_height = (it.max_ascent + it.max_descent
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9018 ? it.max_ascent + it.max_descent
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9019 : last_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9020 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
9021 #else
33074
77c2d2616983 (try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents: 33072
diff changeset
9022 /* 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
9023 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
9024 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
9025 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
9026 added below. */
77c2d2616983 (try_scrolling) <PT >= scroll_margin_pos>: Add 1 to the
Gerd Moellmann <gerd@gnu.org>
parents: 33072
diff changeset
9027 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
9028 #endif
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9029
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9030 if (dy > scroll_max)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9031 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9032
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9033 /* Move the window start down. If scrolling conservatively,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9034 move it just enough down to make point visible. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9035 scroll_step is set, move it down by scroll_step. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9036 start_display (&it, w, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9037
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9038 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
9039 amount_to_scroll =
b714a06b99ec (try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33462
diff changeset
9040 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
9041 else if (scroll_step || temp_scroll_step)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9042 amount_to_scroll = scroll_max;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9043 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9044 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9045 aggressive = current_buffer->scroll_down_aggressively;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9046 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w)
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9047 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9048 if (NUMBERP (aggressive))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9049 amount_to_scroll = XFLOATINT (aggressive) * height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9050 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9051
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9052 if (amount_to_scroll <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9053 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9054
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9055 move_it_vertically (&it, amount_to_scroll);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9056 startp = it.current.pos;
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 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9059 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9060 /* 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
9061 window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9062 scroll_margin_pos = startp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9063 if (this_scroll_margin)
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 start_display (&it, w, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9066 move_it_vertically (&it, this_scroll_margin);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9067 scroll_margin_pos = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9068 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9069
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9070 if (PT < CHARPOS (scroll_margin_pos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9071 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9072 /* 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
9073 above what is displayed in the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9074 int y0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9075
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9076 /* Compute the vertical distance from PT to the scroll
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9077 margin position. Give up if distance is greater than
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9078 scroll_max. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9079 SET_TEXT_POS (pos, PT, PT_BYTE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9080 start_display (&it, w, pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9081 y0 = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9082 move_it_to (&it, CHARPOS (scroll_margin_pos), 0,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9083 it.last_visible_y, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9084 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9085 dy = it.current_y - y0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9086 if (dy > scroll_max)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9087 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9088
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9089 /* Compute new window start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9090 start_display (&it, w, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9091
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9092 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
9093 amount_to_scroll =
b714a06b99ec (try_scrolling): Set scroll_max to max of scroll_* args
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33462
diff changeset
9094 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
9095 else if (scroll_step || temp_scroll_step)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9096 amount_to_scroll = scroll_max;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9097 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9098 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9099 aggressive = current_buffer->scroll_up_aggressively;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9100 height = (WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (w)
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9101 - WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9102 if (NUMBERP (aggressive))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9103 amount_to_scroll = XFLOATINT (aggressive) * height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9104 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9105
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9106 if (amount_to_scroll <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9107 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9108
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9109 move_it_vertically (&it, - amount_to_scroll);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9110 startp = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9111 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9112 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9113
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9114 /* Run window scroll functions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9115 startp = run_window_scroll_functions (window, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9116
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9117 /* 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
9118 doesn't appear. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9119 if (!try_window (window, startp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9120 rc = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9121 else if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9122 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9123 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9124 rc = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9125 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9126 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9127 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9128 /* Maybe forget recorded base line for line number display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9129 if (!just_this_one_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9130 || current_buffer->clip_changed
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9131 || BEG_UNCHANGED < CHARPOS (startp))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9132 w->base_line_number = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9133
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9134 /* If cursor ends up on a partially visible line, shift display
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9135 lines up or down. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9136 make_cursor_line_fully_visible (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9137 rc = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9138 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9139
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9140 return rc;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9141 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9142
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9143
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9144 /* 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
9145 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
9146 was computed.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9147
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9148 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
9149 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
9150 screen line with the minimum distance from the old start W->start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9151
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9152 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9153 compute_window_start_on_continuation_line (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9154 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9155 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9156 struct text_pos pos, start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9157 int window_start_changed_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9158
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9159 SET_TEXT_POS_FROM_MARKER (start_pos, w->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9160
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9161 /* If window start is on a continuation line... Window start may be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9162 < BEGV in case there's invisible text at the start of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9163 buffer (M-x rmail, for example). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9164 if (CHARPOS (start_pos) > BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9165 && FETCH_BYTE (BYTEPOS (start_pos) - 1) != '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9166 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9167 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9168 struct glyph_row *row;
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
9169
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
9170 /* 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
9171 if (CHARPOS (start_pos) < BEGV)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
9172 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
9173 else if (CHARPOS (start_pos) > ZV)
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
9174 SET_TEXT_POS (start_pos, ZV, ZV_BYTE);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9175
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9176 /* Find the start of the continued line. This should be fast
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9177 because scan_buffer is fast (newline cache). */
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9178 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
9179 init_iterator (&it, w, CHARPOS (start_pos), BYTEPOS (start_pos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9180 row, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9181 reseat_at_previous_visible_line_start (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9182
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9183 /* If the line start is "too far" away from the window start,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9184 say it takes too much time to compute a new window start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9185 if (CHARPOS (start_pos) - IT_CHARPOS (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9186 < XFASTINT (w->height) * XFASTINT (w->width))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9187 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9188 int min_distance, distance;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9189
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9190 /* Move forward by display lines to find the new window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9191 start. If window width was enlarged, the new start can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9192 be expected to be > the old start. If window width was
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9193 decreased, the new window start will be < the old start.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9194 So, we're looking for the display line start with the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9195 minimum distance from the old window start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9196 pos = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9197 min_distance = INFINITY;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9198 while ((distance = abs (CHARPOS (start_pos) - IT_CHARPOS (it))),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9199 distance < min_distance)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9200 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9201 min_distance = distance;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9202 pos = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9203 move_it_by_lines (&it, 1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9204 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9205
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9206 /* Set the window start there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9207 SET_MARKER_FROM_TEXT_POS (w->start, pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9208 window_start_changed_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9209 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9210 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9211
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9212 return window_start_changed_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9213 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9214
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9215
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9216 /* 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
9217 with window start STARTP. Value is
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9218
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9219 1 if successful
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9220
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9221 0 if this method cannot be used
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9222
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9223 -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
9224 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
9225 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
9226
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9227 static int
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9228 try_cursor_movement (window, startp, scroll_step)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9229 Lisp_Object window;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9230 struct text_pos startp;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9231 int *scroll_step;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9232 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9233 struct window *w = XWINDOW (window);
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9234 struct frame *f = XFRAME (w->frame);
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9235 int rc = 0;
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 /* 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
9238 not moved off the frame. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9239 if (/* Point may be in this window. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9240 PT >= CHARPOS (startp)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9241 /* Selective display hasn't changed. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9242 && !current_buffer->clip_changed
34440
6fff04f818fa (try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34438
diff changeset
9243 /* Function force-mode-line-update is used to force a thorough
6fff04f818fa (try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34438
diff changeset
9244 redisplay. It sets either windows_or_buffers_changed or
6fff04f818fa (try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34438
diff changeset
9245 update_mode_lines. So don't take a shortcut here for these
6fff04f818fa (try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34438
diff changeset
9246 cases. */
6fff04f818fa (try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34438
diff changeset
9247 && !update_mode_lines
6fff04f818fa (try_cursor_movement): Check update_mode_lines instead
Gerd Moellmann <gerd@gnu.org>
parents: 34438
diff changeset
9248 && !windows_or_buffers_changed
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9249 /* 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
9250 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
9251 set the cursor. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9252 && !(!NILP (Vtransient_mark_mode)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9253 && !NILP (current_buffer->mark_active))
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9254 && NILP (w->region_showing)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9255 && NILP (Vshow_trailing_whitespace)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9256 /* 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
9257 && INTEGERP (w->last_point)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9258 /* 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
9259 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
9260 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
9261 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
9262 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
9263 handles the same cases. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9264 && !EQ (window, minibuf_window)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9265 /* 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
9266 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
9267 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
9268 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
9269 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
9270 && INTEGERP (w->window_end_vpos)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9271 && 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
9272 && (FRAME_WINDOW_P (f)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9273 || !MARKERP (Voverlay_arrow_position)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9274 || current_buffer != XMARKER (Voverlay_arrow_position)->buffer))
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9275 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9276 int this_scroll_margin;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9277 struct glyph_row *row;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9278
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9279 #if GLYPH_DEBUG
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9280 debug_method_add (w, "cursor movement");
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9281 #endif
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9282
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9283 /* 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
9284 of the window. This is a pixel value. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9285 this_scroll_margin = max (0, scroll_margin);
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9286 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
9287 this_scroll_margin *= CANON_Y_UNIT (f);
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9288
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9289 /* 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
9290 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
9291 if (w->last_cursor.vpos < 0
84ec8b66d634 (redisplay_internal): If considering all windows on all
Gerd Moellmann <gerd@gnu.org>
parents: 31118
diff changeset
9292 || 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
9293 rc = -1;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9294 else
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9295 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9296 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
9297 if (row->mode_line_p)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9298 ++row;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9299 if (!row->enabled_p)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9300 rc = -1;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9301 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9302
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9303 if (rc == 0)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9304 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9305 int scroll_p = 0;
32592
b15e9539194b (try_cursor_movement): Use cursor_row_p also when
Gerd Moellmann <gerd@gnu.org>
parents: 32590
diff changeset
9306 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
9307
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9308 if (PT > XFASTINT (w->last_point))
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9309 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9310 /* Point has moved forward. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9311 while (MATRIX_ROW_END_CHARPOS (row) < PT
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9312 && MATRIX_ROW_BOTTOM_Y (row) < last_y)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9313 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9314 xassert (row->enabled_p);
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9315 ++row;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9316 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9317
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9318 /* 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
9319 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
9320 display it in the next line. */
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
9321 while (MATRIX_ROW_BOTTOM_Y (row) < last_y
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
9322 && MATRIX_ROW_END_CHARPOS (row) == PT
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
9323 && !cursor_row_p (w, row))
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
9324 ++row;
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9325
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9326 /* If within the scroll margin, scroll. Note that
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9327 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
9328 the next line would be drawn, and that
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9329 this_scroll_margin can be zero. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9330 if (MATRIX_ROW_BOTTOM_Y (row) > last_y
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9331 || PT > MATRIX_ROW_END_CHARPOS (row)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9332 /* Line is completely visible last line in window
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9333 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
9334 || (MATRIX_ROW_BOTTOM_Y (row) == last_y
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9335 && PT == MATRIX_ROW_END_CHARPOS (row)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9336 && !row->ends_at_zv_p
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9337 && !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
9338 scroll_p = 1;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9339 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9340 else if (PT < XFASTINT (w->last_point))
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9341 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9342 /* 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
9343 CHARPOS (startp) because of the outer
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9344 if-statement. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9345 while (!row->mode_line_p
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9346 && (MATRIX_ROW_START_CHARPOS (row) > PT
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9347 || (MATRIX_ROW_START_CHARPOS (row) == PT
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9348 && 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
9349 && (row->y > this_scroll_margin
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9350 || CHARPOS (startp) == BEGV))
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9351 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9352 xassert (row->enabled_p);
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9353 --row;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9354 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9355
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9356 /* Consider the following case: Window starts at BEGV,
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9357 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
9358 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
9359 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
9360 BEGV and START. Try to handle that case. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9361 if (row < w->current_matrix->rows
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9362 || row->mode_line_p)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9363 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9364 row = w->current_matrix->rows;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9365 if (row->mode_line_p)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9366 ++row;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9367 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9368
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9369 /* 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
9370 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
9371 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
9372 && 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
9373 && !cursor_row_p (w, row))
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9374 ++row;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9375
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9376 /* If within the scroll margin, scroll. */
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9377 if (row->y < this_scroll_margin
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9378 && CHARPOS (startp) != BEGV)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9379 scroll_p = 1;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9380 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9381
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9382 if (PT < MATRIX_ROW_START_CHARPOS (row)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9383 || PT > MATRIX_ROW_END_CHARPOS (row))
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9384 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9385 /* 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
9386 rc = -1;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9387 }
30761
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9388 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
9389 {
34743
c105f9abf6b5 (try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents: 34737
diff changeset
9390 if (PT == MATRIX_ROW_END_CHARPOS (row)
c105f9abf6b5 (try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents: 34737
diff changeset
9391 && !row->ends_at_zv_p
c105f9abf6b5 (try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents: 34737
diff changeset
9392 && !MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row))
34737
84f309395a36 (try_cursor_movement): If we end on a partially
Gerd Moellmann <gerd@gnu.org>
parents: 34664
diff changeset
9393 rc = -1;
84f309395a36 (try_cursor_movement): If we end on a partially
Gerd Moellmann <gerd@gnu.org>
parents: 34664
diff changeset
9394 else if (row->height > window_box_height (w))
30761
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9395 {
34743
c105f9abf6b5 (try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents: 34737
diff changeset
9396 /* If we end up in a partially visible line, let's
c105f9abf6b5 (try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents: 34737
diff changeset
9397 make it fully visible, except when it's taller
c105f9abf6b5 (try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents: 34737
diff changeset
9398 than the window, in which case we can't do much
c105f9abf6b5 (try_cursor_movement): Fix last change. The real
Gerd Moellmann <gerd@gnu.org>
parents: 34737
diff changeset
9399 about it. */
30761
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9400 *scroll_step = 1;
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9401 rc = -1;
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9402 }
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9403 else
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9404 {
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9405 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
9406 try_window (window, startp);
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9407 make_cursor_line_fully_visible (w);
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9408 rc = 1;
8218291cc912 (try_cursor_movement): Fix handling of cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 30747
diff changeset
9409 }
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9410 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9411 else if (scroll_p)
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9412 rc = -1;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9413 else
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9414 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9415 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
9416 rc = 1;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9417 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9418 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9419 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9420
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9421 return rc;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9422 }
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9423
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9424
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9425 /* Redisplay leaf window WINDOW. JUST_THIS_ONE_P non-zero means only
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9426 selected_window is redisplayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9427
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9428 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9429 redisplay_window (window, just_this_one_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9430 Lisp_Object window;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9431 int just_this_one_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9432 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9433 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9434 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9435 struct buffer *buffer = XBUFFER (w->buffer);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9436 struct buffer *old = current_buffer;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9437 struct text_pos lpoint, opoint, startp;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9438 int update_mode_line;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9439 int tem;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9440 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9441 /* Record it now because it's overwritten. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9442 int current_matrix_up_to_date_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9443 int temp_scroll_step = 0;
33600
c5f64497e92c Use BINDING_STACK_SIZE throughout.
Gerd Moellmann <gerd@gnu.org>
parents: 33594
diff changeset
9444 int count = BINDING_STACK_SIZE ();
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9445 int rc;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9446
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9447 SET_TEXT_POS (lpoint, PT, PT_BYTE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9448 opoint = lpoint;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9449
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9450 /* W must be a leaf window here. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9451 xassert (!NILP (w->buffer));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9452 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9453 *w->desired_matrix->method = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9454 #endif
21748
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
9455
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
9456 specbind (Qinhibit_point_motion_hooks, Qt);
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9457
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9458 reconsider_clip_changes (w, buffer);
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9459
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9460 /* Has the mode line to be updated? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9461 update_mode_line = (!NILP (w->update_mode_line)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9462 || update_mode_lines
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9463 || buffer->clip_changed);
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
9464
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
9465 if (MINI_WINDOW_P (w))
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
9466 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9467 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
9468 && !NILP (echo_area_buffer[0]))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9469 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9470 if (update_mode_line)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9471 /* 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
9472 tool-bar. Example `M-x C-h C-h C-g'. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9473 goto finish_menu_bars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9474 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9475 /* We've already displayed the echo area glyphs in this window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9476 goto finish_scroll_bars;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9477 }
12629
55241c80f448 (echo_area_display): Use selected frame's minibuf window
Richard M. Stallman <rms@gnu.org>
parents: 12598
diff changeset
9478 else if (w != XWINDOW (minibuf_window))
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
9479 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9480 /* W is a mini-buffer window, but it's not the currently
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9481 active one, so clear it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9482 int yb = window_text_bottom_y (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9483 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9484 int y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9485
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9486 for (y = 0, row = w->desired_matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9487 y < yb;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9488 y += row->height, ++row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9489 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
9490 goto finish_scroll_bars;
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
9491 }
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
9492 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9493
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9494 /* Otherwise set up data on this window; select its buffer and point
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9495 value. */
29445
cb3ad8f8f0ed (redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents: 29433
diff changeset
9496 /* 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
9497 variables. */
cb3ad8f8f0ed (redisplay_window): Always use set_buffer_internal_1.
Gerd Moellmann <gerd@gnu.org>
parents: 29433
diff changeset
9498 set_buffer_internal_1 (XBUFFER (w->buffer));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9499 SET_TEXT_POS (opoint, PT, PT_BYTE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9500
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9501 current_matrix_up_to_date_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9502 = (!NILP (w->window_end_valid)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9503 && !current_buffer->clip_changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9504 && XFASTINT (w->last_modified) >= MODIFF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9505 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9506
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9507 /* 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
9508 the window end being valid, so set it to nil there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9509 if (windows_or_buffers_changed)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9510 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9511 /* If window starts on a continuation line, maybe adjust the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9512 window start in case the window's width changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9513 if (XMARKER (w->start)->buffer == current_buffer)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9514 compute_window_start_on_continuation_line (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9515
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9516 w->window_end_valid = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9517 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9518
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9519 /* Some sanity checks. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9520 CHECK_WINDOW_END (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9521 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
9522 abort ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9523 if (BYTEPOS (opoint) < CHARPOS (opoint))
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
9524 abort ();
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9525
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
9526 /* 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
9527 if (!NILP (w->column_number_displayed)
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
9528 /* This alternative quickly identifies a common case
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
9529 where no change is needed. */
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
9530 && !(PT == XFASTINT (w->last_point)
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
9531 && XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
9532 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)
12472
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
9533 && XFASTINT (w->column_number_displayed) != current_column ())
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
9534 update_mode_line = 1;
f92dc5a9194d (clip_changed): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 12410
diff changeset
9535
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9536 /* Count number of windows showing the selected buffer. An indirect
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9537 buffer counts as its base buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9538 if (!just_this_one_p)
10303
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9539 {
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9540 struct buffer *current_base, *window_base;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9541 current_base = current_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9542 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
9543 if (current_base->base_buffer)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9544 current_base = current_base->base_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9545 if (window_base->base_buffer)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9546 window_base = window_base->base_buffer;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9547 if (current_base == window_base)
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9548 buffer_shared++;
e951e8dddc8b Use SAVE_MODIFF and BUF_SAVE_MODIFF
Richard M. Stallman <rms@gnu.org>
parents: 9987
diff changeset
9549 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9550
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9551 /* Point refers normally to the selected window. For any other
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9552 window, set up appropriate value. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9553 if (!EQ (window, selected_window))
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9554 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
9555 int new_pt = XMARKER (w->pointm)->charpos;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
9556 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
9557 if (new_pt < BEGV)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9558 {
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
9559 new_pt = BEGV;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
9560 new_pt_byte = BEGV_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
9561 set_marker_both (w->pointm, Qnil, BEGV, BEGV_BYTE);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9562 }
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
9563 else if (new_pt > (ZV - 1))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9564 {
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
9565 new_pt = ZV;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
9566 new_pt_byte = ZV_BYTE;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
9567 set_marker_both (w->pointm, Qnil, ZV, ZV_BYTE);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9568 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9569
8417
3f2854a14982 (redisplay_window): Avoid using SET_PT to change point temporarily.
Richard M. Stallman <rms@gnu.org>
parents: 8386
diff changeset
9570 /* 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
9571 TEMP_SET_PT_BOTH (new_pt, new_pt_byte);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9572 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9573
9412
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
9574 /* If any of the character widths specified in the display table
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9575 have changed, invalidate the width run cache. It's true that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9576 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
9577 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
9578 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
9579 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
9580 {
13188
dc0909e788bd (redisplay_window, redisplay_window, display_text_line):
Richard M. Stallman <rms@gnu.org>
parents: 13104
diff changeset
9581 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
9582
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
9583 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
9584 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
9585 {
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
9586 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
9587 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
9588 BEG, Z);
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
9589 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
9590 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
9591 }
53898786366f * xdisp.c (redisplay_window): Invalidate width_run_cache, if the
Jim Blandy <jimb@redhat.com>
parents: 9330
diff changeset
9592
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9593 /* If window-start is screwed up, choose a new one. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9594 if (XMARKER (w->start)->buffer != current_buffer)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9595 goto recenter;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9596
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9597 SET_TEXT_POS_FROM_MARKER (startp, w->start);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9598
16554
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
9599 /* 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
9600 check whether it can be used. */
26908
c5079639cac1 (redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents: 26874
diff changeset
9601 if (!NILP (w->optional_new_start)
c5079639cac1 (redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents: 26874
diff changeset
9602 && CHARPOS (startp) >= BEGV
c5079639cac1 (redisplay_window) <optional new window start>: Check
Gerd Moellmann <gerd@gnu.org>
parents: 26874
diff changeset
9603 && CHARPOS (startp) <= ZV)
16554
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
9604 {
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
9605 w->optional_new_start = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9606 start_display (&it, w, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9607 move_it_to (&it, PT, 0, it.last_visible_y, -1,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9608 MOVE_TO_POS | MOVE_TO_X | MOVE_TO_Y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9609 if (IT_CHARPOS (it) == PT)
16554
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
9610 w->force_start = Qt;
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
9611 }
f930574421d9 (redisplay_window): Handle optional_new_start.
Richard M. Stallman <rms@gnu.org>
parents: 16527
diff changeset
9612
433
1c6c6382f1d7 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 371
diff changeset
9613 /* 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
9614 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
9615 if (!NILP (w->force_start)
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
9616 || w->frozen_window_start_p)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9617 {
13833
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
9618 w->force_start = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9619 w->vscroll = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9620 w->window_end_valid = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9621
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9622 /* Forget any recorded base line for line number display. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9623 if (!current_matrix_up_to_date_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9624 || current_buffer->clip_changed)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9625 w->base_line_number = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9626
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
9627 /* 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
9628 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
9629 because we have scrolled. */
13833
467bc73e8734 (redisplay_window): Clear force_start field
Richard M. Stallman <rms@gnu.org>
parents: 13826
diff changeset
9630 /* 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
9631 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
9632 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
9633 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
9634 if (!update_mode_line
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
9635 || ! NILP (Vwindow_scroll_functions))
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9636 {
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9637 update_mode_line = 1;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9638 w->update_mode_line = Qt;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9639 startp = run_window_scroll_functions (window, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9640 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9641
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
9642 XSETFASTINT (w->last_modified, 0);
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
9643 XSETFASTINT (w->last_overlay_modified, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9644 if (CHARPOS (startp) < BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9645 SET_TEXT_POS (startp, BEGV, BEGV_BYTE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9646 else if (CHARPOS (startp) > ZV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9647 SET_TEXT_POS (startp, ZV, ZV_BYTE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9648
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9649 /* Redisplay, then check if cursor has been set during the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9650 redisplay. Give up if new fonts were loaded. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9651 if (!try_window (window, startp))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9652 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9653 w->force_start = Qt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9654 clear_glyph_matrix (w->desired_matrix);
34844
4756a759c825 (syms_of_xdisp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34802
diff changeset
9655 goto finish_scroll_bars;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9656 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9657
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
9658 if (w->cursor.vpos < 0 && !w->frozen_window_start_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9659 {
30652
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
9660 /* 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
9661 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
9662 can use it here. */
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
9663 int window_height;
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
9664 struct glyph_row *row;
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
9665
4ed1978642cb (start_display): WHen starting display on a continuation
Gerd Moellmann <gerd@gnu.org>
parents: 30631
diff changeset
9666 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
9667 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
9668 while (MATRIX_ROW_BOTTOM_Y (row) < window_height)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9669 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9670
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9671 TEMP_SET_PT_BOTH (MATRIX_ROW_START_CHARPOS (row),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9672 MATRIX_ROW_START_BYTEPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9673
5230
8c30e49ddc04 (message): Use message2, not message1.
Richard M. Stallman <rms@gnu.org>
parents: 5082
diff changeset
9674 if (w != XWINDOW (selected_window))
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
9675 set_marker_both (w->pointm, Qnil, PT, PT_BYTE);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9676 else if (current_buffer == old)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9677 SET_TEXT_POS (lpoint, PT, PT_BYTE);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9678
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9679 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
9680
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9681 /* If we are highlighting the region, then we just changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9682 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
9683 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
9684 && !NILP (current_buffer->mark_active))
9420
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
9685 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9686 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9687 if (!try_window (window, startp))
34844
4756a759c825 (syms_of_xdisp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34802
diff changeset
9688 goto finish_scroll_bars;
9420
836113a97d92 (redisplay_window): Fix Oct 1 change:
Richard M. Stallman <rms@gnu.org>
parents: 9412
diff changeset
9689 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9690 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9691
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9692 make_cursor_line_fully_visible (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9693 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9694 debug_method_add (w, "forced window start");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9695 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9696 goto done;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9697 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9698
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9699 /* Handle case where text has not changed, only point, and it has
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9700 not moved off the frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9701 if (current_matrix_up_to_date_p
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9702 && (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
9703 rc != 0))
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9704 {
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9705 if (rc == -1)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9706 goto try_to_scroll;
30744
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9707 else
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9708 goto done;
6181f12f7f51 (trace_move) [GLYPH_DEBUG]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30728
diff changeset
9709 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9710 /* If current starting point was originally the beginning of a line
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9711 but no longer is, find a new starting point. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
9712 else if (!NILP (w->start_at_line_beg)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9713 && !(CHARPOS (startp) <= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9714 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n'))
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 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9717 debug_method_add (w, "recenter 1");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9718 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9719 goto recenter;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9720 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9721
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9722 /* Try scrolling with try_window_id. */
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9723 else if (/* Windows and buffers haven't changed. */
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9724 !windows_or_buffers_changed
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9725 /* Window must be either use window-based redisplay or
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9726 be full width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9727 && (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
9728 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w)))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9729 && !MINI_WINDOW_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9730 /* Point is not known NOT to appear in window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9731 && PT >= CHARPOS (startp)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9732 && XFASTINT (w->last_modified)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9733 /* Window is not hscrolled. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9734 && XFASTINT (w->hscroll) == 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9735 /* Selective display has not changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9736 && !current_buffer->clip_changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9737 /* Current matrix is up to date. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9738 && !NILP (w->window_end_valid)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9739 /* Can't use this case if highlighting a region because
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9740 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
9741 && !(!NILP (Vtransient_mark_mode)
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
9742 && !NILP (current_buffer->mark_active))
3bcbd1795280 (mark_window_display_accurate): Set region_showing fields.
Richard M. Stallman <rms@gnu.org>
parents: 2766
diff changeset
9743 && NILP (w->region_showing)
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
9744 && NILP (Vshow_trailing_whitespace)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9745 /* Overlay arrow position and string not changed. */
19205
7448901d6449 (COERCE_MARKER): New macro.
Richard M. Stallman <rms@gnu.org>
parents: 19197
diff changeset
9746 && EQ (last_arrow_position, COERCE_MARKER (Voverlay_arrow_position))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9747 && EQ (last_arrow_string, Voverlay_arrow_string)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9748 /* 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
9749 know that the same window start will not work. It is 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9750 if unsuccessful for some other reason. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9751 && (tem = try_window_id (w)) != 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9752 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9753 #if GLYPH_DEBUG
30136
8dc78ef485a4 (try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents: 29981
diff changeset
9754 debug_method_add (w, "try_window_id %d", tem);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9755 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9756
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9757 if (fonts_changed_p)
34844
4756a759c825 (syms_of_xdisp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34802
diff changeset
9758 goto finish_scroll_bars;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9759 if (tem > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9760 goto done;
30136
8dc78ef485a4 (try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents: 29981
diff changeset
9761
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9762 /* Otherwise try_window_id has returned -1 which means that we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9763 don't want the alternative below this comment to execute. */
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 else if (CHARPOS (startp) >= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9766 && CHARPOS (startp) <= ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9767 && PT >= CHARPOS (startp)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9768 && (CHARPOS (startp) < ZV
14662
9e8607589f03 (redisplay_internal): Renamed from redisplay.
Richard M. Stallman <rms@gnu.org>
parents: 14614
diff changeset
9769 /* Avoid starting at end of buffer. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9770 || CHARPOS (startp) == BEGV
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
9771 || (XFASTINT (w->last_modified) >= MODIFF
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
9772 && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9773 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9774 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9775 debug_method_add (w, "same window start");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9776 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9777
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9778 /* Try to redisplay starting at same place as before.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9779 If point has not moved off frame, accept the results. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9780 if (!current_matrix_up_to_date_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9781 /* 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
9782 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
9783 buffer. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9784 || !NILP (Vwindow_scroll_functions)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9785 || MINI_WINDOW_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9786 || !try_window_reusing_current_matrix (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9787 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9788 IF_DEBUG (debug_method_add (w, "1"));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9789 try_window (window, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9790 }
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 if (fonts_changed_p)
34844
4756a759c825 (syms_of_xdisp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34802
diff changeset
9793 goto finish_scroll_bars;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9794
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9795 if (w->cursor.vpos >= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9796 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9797 if (!just_this_one_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9798 || current_buffer->clip_changed
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
9799 || BEG_UNCHANGED < CHARPOS (startp))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9800 /* 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
9801 w->base_line_number = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9802
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9803 make_cursor_line_fully_visible (w);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9804 goto done;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9805 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9806 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9807 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9808 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9809
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9810 try_to_scroll:
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9811
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
9812 XSETFASTINT (w->last_modified, 0);
16197
952b01cdfa56 (redisplay_internal, mark_window_display_accurate)
Richard M. Stallman <rms@gnu.org>
parents: 16095
diff changeset
9813 XSETFASTINT (w->last_overlay_modified, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9814
10764
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9815 /* 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
9816 if (!update_mode_line)
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9817 {
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9818 update_mode_line = 1;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9819 w->update_mode_line = Qt;
a3e635f3501e (redisplay_window): If we update the mode line,
Richard M. Stallman <rms@gnu.org>
parents: 10688
diff changeset
9820 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9821
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9822 /* Try to scroll by specified few lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9823 if ((scroll_conservatively
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9824 || scroll_step
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9825 || temp_scroll_step
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9826 || NUMBERP (current_buffer->scroll_up_aggressively)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9827 || 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
9828 && !current_buffer->clip_changed
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9829 && CHARPOS (startp) >= BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9830 && CHARPOS (startp) <= ZV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9831 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9832 /* The function returns -1 if new fonts were loaded, 1 if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9833 successful, 0 if not successful. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9834 int rc = try_scrolling (window, just_this_one_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9835 scroll_conservatively,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9836 scroll_step,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9837 temp_scroll_step);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9838 if (rc > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9839 goto done;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9840 else if (rc < 0)
34844
4756a759c825 (syms_of_xdisp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34802
diff changeset
9841 goto finish_scroll_bars;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9844 /* Finally, just choose place to start which centers point */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9845
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9846 recenter:
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 GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9849 debug_method_add (w, "recenter");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9850 #endif
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 /* w->vscroll = 0; */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9853
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9854 /* Forget any previously recorded base line for line number display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9855 if (!current_matrix_up_to_date_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9856 || current_buffer->clip_changed)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9857 w->base_line_number = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9858
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9859 /* Move backward half the height of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9860 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9861 it.current_y = it.last_visible_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9862 move_it_vertically_backward (&it, it.last_visible_y / 2);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9863 xassert (IT_CHARPOS (it) >= BEGV);
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 /* The function move_it_vertically_backward may move over more
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9866 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
9867 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
9868 display area. Start displaying at the start of the line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9869 containing PT in this case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9870 if (it.current_y <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9871 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9872 init_iterator (&it, w, PT, PT_BYTE, NULL, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9873 move_it_vertically (&it, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9874 xassert (IT_CHARPOS (it) <= PT);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9875 it.current_y = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9876 }
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 it.current_x = it.hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9879
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9880 /* Set startp here explicitly in case that helps avoid an infinite loop
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9881 in case the window-scroll-functions functions get errors. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9882 set_marker_both (w->start, Qnil, IT_CHARPOS (it), IT_BYTEPOS (it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9883
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9884 /* Run scroll hooks. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9885 startp = run_window_scroll_functions (window, it.current.pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9886
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9887 /* Redisplay the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9888 if (!current_matrix_up_to_date_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9889 || windows_or_buffers_changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9890 /* Don't use try_window_reusing_current_matrix in this case
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9891 because it can have changed the buffer. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9892 || !NILP (Vwindow_scroll_functions)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9893 || !just_this_one_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9894 || MINI_WINDOW_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9895 || !try_window_reusing_current_matrix (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9896 try_window (window, startp);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9897
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9898 /* If new fonts have been loaded (due to fontsets), give up. We
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9899 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
9900 matrices. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9901 if (fonts_changed_p)
34844
4756a759c825 (syms_of_xdisp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34802
diff changeset
9902 goto finish_scroll_bars;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9903
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9904 /* 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
9905 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
9906 (Imagine a window of height 100, displaying two lines of height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9907 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
9908 line.) */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9909 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9910 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9911 if (!NILP (w->window_end_valid)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9912 && PT >= Z - XFASTINT (w->window_end_pos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9913 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9914 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9915 move_it_by_lines (&it, 1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9916 try_window (window, it.current.pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9917 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9918 else if (PT < IT_CHARPOS (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9919 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9920 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9921 move_it_by_lines (&it, -1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9922 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
9923 }
21845
1bae35c78db2 (redisplay_window): Update STARTP_BYTE alongside with
Andreas Schwab <schwab@suse.de>
parents: 21825
diff changeset
9924 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9925 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9926 /* Not much we can do about it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9927 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9928 }
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 /* Consider the following case: Window starts at BEGV, there is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9931 invisible, intangible text at BEGV, so that display starts at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9932 some point START > BEGV. It can happen that we are called with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9933 PT somewhere between BEGV and START. Try to handle that case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9934 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9935 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9936 struct glyph_row *row = w->current_matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9937 if (row->mode_line_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9938 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9939 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
9940 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9941
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9942 make_cursor_line_fully_visible (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9943
25695
9e6edb8bc242 (redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents: 25693
diff changeset
9944 done:
9e6edb8bc242 (redisplay_window): Make sure start_at_line_beg
Gerd Moellmann <gerd@gnu.org>
parents: 25693
diff changeset
9945
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9946 SET_TEXT_POS_FROM_MARKER (startp, w->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9947 w->start_at_line_beg = ((CHARPOS (startp) == BEGV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9948 || FETCH_BYTE (BYTEPOS (startp) - 1) == '\n')
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9949 ? Qt : Qnil);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9950
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9951 /* 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
9952 if ((update_mode_line
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
9953 /* If window not full width, must redo its mode line
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9954 if (a) the window to its side is being redone and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9955 (b) we do a frame-based redisplay. This is a consequence
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9956 of how inverted lines are drawn in frame-based redisplay. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9957 || (!just_this_one_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9958 && !FRAME_WINDOW_P (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9959 && !WINDOW_FULL_WIDTH_P (w))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9960 /* 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
9961 || INTEGERP (w->base_line_pos)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9962 /* 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
9963 || (!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
9964 && XFASTINT (w->column_number_displayed) != current_column ()))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9965 /* This means that the window has a mode line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9966 && (WINDOW_WANTS_MODELINE_P (w)
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9967 || WINDOW_WANTS_HEADER_LINE_P (w)))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9968 {
29291
4849a9a666ab (redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents: 29191
diff changeset
9969 Lisp_Object old_selected_frame;
4849a9a666ab (redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents: 29191
diff changeset
9970
4849a9a666ab (redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents: 29191
diff changeset
9971 old_selected_frame = selected_frame;
4849a9a666ab (redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents: 29191
diff changeset
9972
4849a9a666ab (redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents: 29191
diff changeset
9973 XSETFRAME (selected_frame, f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9974 display_mode_lines (w);
29291
4849a9a666ab (redisplay_window): Really switch buffers when
Gerd Moellmann <gerd@gnu.org>
parents: 29191
diff changeset
9975 selected_frame = old_selected_frame;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9976
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9977 /* If mode line height has changed, arrange for a thorough
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9978 immediate redisplay using the correct mode line height. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9979 if (WINDOW_WANTS_MODELINE_P (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9980 && CURRENT_MODE_LINE_HEIGHT (w) != DESIRED_MODE_LINE_HEIGHT (w))
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 fonts_changed_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9983 MATRIX_MODE_LINE_ROW (w->current_matrix)->height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9984 = DESIRED_MODE_LINE_HEIGHT (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9985 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9986
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9987 /* If top line height has changed, arrange for a thorough
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9988 immediate redisplay using the correct mode line height. */
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9989 if (WINDOW_WANTS_HEADER_LINE_P (w)
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9990 && CURRENT_HEADER_LINE_HEIGHT (w) != DESIRED_HEADER_LINE_HEIGHT (w))
25012
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 fonts_changed_p = 1;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9993 MATRIX_HEADER_LINE_ROW (w->current_matrix)->height
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
9994 = DESIRED_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9995 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9996
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9997 if (fonts_changed_p)
34844
4756a759c825 (syms_of_xdisp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34802
diff changeset
9998 goto finish_scroll_bars;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
9999 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10000
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10001 if (!line_number_displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10002 && !BUFFERP (w->base_line_pos))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
10003 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
10004 w->base_line_pos = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
10005 w->base_line_number = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
10006 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10007
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10008 finish_menu_bars:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10009
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
10010 /* 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
10011 if (update_mode_line
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10012 && EQ (FRAME_SELECTED_WINDOW (f), window))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10013 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10014 int redisplay_menu_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10015
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10016 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10017 {
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
10018 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (macintosh)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10019 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
10020 #else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10021 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
10022 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10023 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10024 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10025 redisplay_menu_p = FRAME_MENU_BAR_LINES (f) > 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10026
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10027 if (redisplay_menu_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10028 display_menu_bar (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10029
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10030 #ifdef HAVE_WINDOW_SYSTEM
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10031 if (WINDOWP (f->tool_bar_window)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10032 && (FRAME_TOOL_BAR_LINES (f) > 0
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10033 || auto_resize_tool_bars_p))
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10034 redisplay_tool_bar (f);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10035 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10036 }
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
10037
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
10038 finish_scroll_bars:
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10039
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
10040 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
10041 {
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
10042 int start, end, whole;
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
10043
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
10044 /* 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
10045 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
10046 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
10047 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
10048 visible region.
80805283464a * xdisp.c (redisplay_window): Make the scrollbar reflect the
Jim Blandy <jimb@redhat.com>
parents: 2848
diff changeset
10049
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10050 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
10051 if (!MINI_WINDOW_P (w)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10052 || (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
10053 && 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
10054 {
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
10055 whole = ZV - BEGV;
11108
ad6e21535db6 (redisplay): Make sure pause is set before used.
Karl Heuer <kwzh@gnu.org>
parents: 11085
diff changeset
10056 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
10057 /* 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
10058 moment, we'll pretend it is. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10059 end = (Z - XFASTINT (w->window_end_pos)) - BEGV;
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 if (end < start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10062 end = start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10063 if (whole < (end - start))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10064 whole = end - start;
1785
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
10065 }
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
10066 else
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
10067 start = end = whole = 0;
19755499df90 * window.c (window_internal_width): New function, which accounts
Jim Blandy <jimb@redhat.com>
parents: 1718
diff changeset
10068
1992
37c45885540a * xdisp.c (redisplay): Protect calls to request_sigio and
Jim Blandy <jimb@redhat.com>
parents: 1873
diff changeset
10069 /* Indicate what this scroll bar ought to be displaying now. */
34844
4756a759c825 (syms_of_xdisp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34802
diff changeset
10070 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
10071
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10072 /* Note that we actually used the scroll bar attached to this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10073 window, so it shouldn't be deleted at the end of redisplay. */
34844
4756a759c825 (syms_of_xdisp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34802
diff changeset
10074 redeem_scroll_bar_hook (w);
4756a759c825 (syms_of_xdisp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34802
diff changeset
10075 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10076
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10077 /* Restore current_buffer and value of point in it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10078 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
10079 set_buffer_internal_1 (old);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10080 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
10081
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
10082 unbind_to (count, Qnil);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10083 }
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10086 /* Build the complete desired matrix of WINDOW with a window start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10087 buffer position POS. Value is non-zero if successful. It is zero
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10088 if fonts were loaded during redisplay which makes re-adjusting
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10089 glyph matrices necessary. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10090
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10091 int
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10092 try_window (window, pos)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10093 Lisp_Object window;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10094 struct text_pos pos;
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 struct window *w = XWINDOW (window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10097 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10098 struct glyph_row *last_text_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10099
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10100 /* Make POS the new window start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10101 set_marker_both (w->start, Qnil, CHARPOS (pos), BYTEPOS (pos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10102
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10103 /* Mark cursor position as unknown. No overlay arrow seen. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10104 w->cursor.vpos = -1;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10105 overlay_arrow_seen = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10106
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10107 /* Initialize iterator and info to start at POS. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10108 start_display (&it, w, pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10109
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10110 /* Display all lines of W. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10111 while (it.current_y < it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10112 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10113 if (display_line (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10114 last_text_row = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10115 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10116 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10117 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10118
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10119 /* If bottom moved off end of frame, change mode line percentage. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10120 if (XFASTINT (w->window_end_pos) <= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10121 && Z != IT_CHARPOS (it))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10122 w->update_mode_line = Qt;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10123
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10124 /* Set window_end_pos to the offset of the last character displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10125 on the window from the end of current_buffer. Set
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10126 window_end_vpos to its row number. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10127 if (last_text_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10128 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10129 xassert (MATRIX_ROW_DISPLAYS_TEXT_P (last_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10130 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10131 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10132 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10133 Z - MATRIX_ROW_END_CHARPOS (last_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10134 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10135 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10136 xassert (MATRIX_ROW (w->desired_matrix, XFASTINT (w->window_end_vpos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10137 ->displays_text_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10138 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10139 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10140 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10141 w->window_end_bytepos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10142 XSETFASTINT (w->window_end_pos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10143 XSETFASTINT (w->window_end_vpos, 0);
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
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10146 /* But that is not valid info until redisplay finishes. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10147 w->window_end_valid = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10148 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10149 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10150
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10151
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10152
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10153 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10154 Window redisplay reusing current matrix when buffer has not changed
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10157 /* Try redisplay of window W showing an unchanged buffer with a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10158 different window start than the last time it was displayed by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10159 reusing its current matrix. Value is non-zero if successful.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10160 W->start is the new window start. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10161
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10162 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10163 try_window_reusing_current_matrix (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10164 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10165 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10166 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10167 struct glyph_row *row, *bottom_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10168 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10169 struct run run;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10170 struct text_pos start, new_start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10171 int nrows_scrolled, i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10172 struct glyph_row *last_text_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10173 struct glyph_row *last_reused_text_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10174 struct glyph_row *start_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10175 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
10176
e4256ac89b92 (try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents: 29960
diff changeset
10177 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
10178 !FRAME_WINDOW_P (f)
e4256ac89b92 (try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents: 29960
diff changeset
10179 /* 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
10180 or such. */
e4256ac89b92 (try_window_reusing_current_matrix): Don't try to reuse
Gerd Moellmann <gerd@gnu.org>
parents: 29960
diff changeset
10181 || windows_or_buffers_changed)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10182 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10183
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10184 /* Can't do this if region may have changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10185 if ((!NILP (Vtransient_mark_mode)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10186 && !NILP (current_buffer->mark_active))
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
10187 || !NILP (w->region_showing)
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
10188 || !NILP (Vshow_trailing_whitespace))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10189 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10190
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10191 /* If top-line visibility has changed, give up. */
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10192 if (WINDOW_WANTS_HEADER_LINE_P (w)
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10193 != MATRIX_HEADER_LINE_ROW (w->current_matrix)->mode_line_p)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10194 return 0;
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 /* Give up if old or new display is scrolled vertically. We could
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10197 make this function handle this, but right now it doesn't. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10198 start_row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10199 if (w->vscroll || MATRIX_ROW_PARTIALLY_VISIBLE_P (start_row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10200 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10201
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10202 /* The variable new_start now holds the new window start. The old
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10203 start `start' can be determined from the current matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10204 SET_TEXT_POS_FROM_MARKER (new_start, w->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10205 start = start_row->start.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10206 start_vpos = MATRIX_ROW_VPOS (start_row, w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10207
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10208 /* Clear the desired matrix for the display below. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10209 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10210
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10211 if (CHARPOS (new_start) <= CHARPOS (start))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10212 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10213 int first_row_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10214
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10215 IF_DEBUG (debug_method_add (w, "twu1"));
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 /* Display up to a row that can be reused. The variable
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10218 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
10219 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
10220 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
10221 start_display (&it, w, new_start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10222 first_row_y = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10223 w->cursor.vpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10224 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
10225
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10226 while (it.current_y < it.last_visible_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10227 && IT_CHARPOS (it) < CHARPOS (start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10228 && !fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10229 if (display_line (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10230 last_text_row = it.glyph_row - 1;
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 /* A value of current_y < last_visible_y means that we stopped
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10233 at the previous window start, which in turn means that we
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10234 have at least one reusable row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10235 if (it.current_y < it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10236 {
31849
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10237 /* IT.vpos always starts from 0; it counts text lines. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10238 nrows_scrolled = it.vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10239
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10240 /* Find PT if not already found in the lines displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10241 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10242 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10243 int dy = it.current_y - first_row_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10244
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10245 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10246 while (MATRIX_ROW_DISPLAYS_TEXT_P (row))
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 if (PT >= MATRIX_ROW_START_CHARPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10249 && PT < MATRIX_ROW_END_CHARPOS (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10250 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10251 set_cursor_from_row (w, row, w->current_matrix, 0, 0,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10252 dy, nrows_scrolled);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10253 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10254 }
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 (MATRIX_ROW_BOTTOM_Y (row) + dy >= it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10257 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10258
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10259 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10260 }
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 /* Give up if point was not found. This shouldn't
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10263 happen often; not more often than with try_window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10264 itself. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10265 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10266 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10267 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10268 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10269 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10270 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10271
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10272 /* Scroll the display. Do it before the current matrix is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10273 changed. The problem here is that update has not yet
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10274 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
10275 scroll_run_hook will clear the cursor, and use the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10276 current matrix to get the height of the row the cursor is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10277 in. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10278 run.current_y = first_row_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10279 run.desired_y = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10280 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
10281
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10282 if (run.height > 0 && run.current_y != run.desired_y)
25012
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 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10285 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
10286 rif->clear_mouse_face (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10287 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
10288 rif->update_window_end_hook (w, 0, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10289 update_end (f);
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10292 /* Shift current matrix down by nrows_scrolled lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10293 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10294 rotate_matrix (w->current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10295 start_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10296 MATRIX_ROW_VPOS (bottom_row, w->current_matrix),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10297 nrows_scrolled);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10298
34927
2470fec0dd92 (try_window_reusing_current_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34924
diff changeset
10299 /* Disable lines that must be updated. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10300 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
10301 (start_row + i)->enabled_p = 0;
34927
2470fec0dd92 (try_window_reusing_current_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34924
diff changeset
10302
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10303 /* Re-compute Y positions. */
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10304 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10305 max_y = it.last_visible_y;
31849
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10306 for (row = start_row + nrows_scrolled;
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10307 row < bottom_row;
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10308 ++row)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10309 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10310 row->y = it.current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10311
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10312 if (row->y < min_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10313 row->visible_height = row->height - (min_y - row->y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10314 else if (row->y + row->height > max_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10315 row->visible_height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10316 = row->height - (row->y + row->height - max_y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10317 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10318 row->visible_height = row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10319
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10320 it.current_y += row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10321
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10322 if (MATRIX_ROW_DISPLAYS_TEXT_P (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10323 last_reused_text_row = row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10324 if (MATRIX_ROW_BOTTOM_Y (row) >= it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10325 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10326 }
34927
2470fec0dd92 (try_window_reusing_current_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34924
diff changeset
10327
2470fec0dd92 (try_window_reusing_current_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34924
diff changeset
10328 /* Disable lines in the current matrix which are now
2470fec0dd92 (try_window_reusing_current_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34924
diff changeset
10329 below the window. */
35017
53c3e3f3949b (try_window_reusing_current_matrix): Fix bug setting
Gerd Moellmann <gerd@gnu.org>
parents: 35005
diff changeset
10330 for (++row; row < bottom_row; ++row)
34927
2470fec0dd92 (try_window_reusing_current_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34924
diff changeset
10331 row->enabled_p = 0;
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10334 /* Update window_end_pos etc.; last_reused_text_row is the last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10335 reused row from the current matrix containing text, if any.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10336 The value of last_text_row is the last displayed line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10337 containing text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10338 if (last_reused_text_row)
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 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10341 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_reused_text_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10342 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10343 Z - MATRIX_ROW_END_CHARPOS (last_reused_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10344 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10345 MATRIX_ROW_VPOS (last_reused_text_row,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10346 w->current_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10347 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10348 else if (last_text_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10349 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10350 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10351 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10352 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10353 Z - MATRIX_ROW_END_CHARPOS (last_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10354 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10355 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10356 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10357 else
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 /* This window must be completely empty. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10360 w->window_end_bytepos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10361 XSETFASTINT (w->window_end_pos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10362 XSETFASTINT (w->window_end_vpos, 0);
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 w->window_end_valid = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10365
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10366 /* Update hint: don't try scrolling again in update_window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10367 w->desired_matrix->no_scrolling_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10368
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10369 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10370 debug_method_add (w, "try_window_reusing_current_matrix 1");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10371 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10372 return 1;
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 else if (CHARPOS (new_start) > CHARPOS (start))
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 struct glyph_row *pt_row, *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10377 struct glyph_row *first_reusable_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10378 struct glyph_row *first_row_to_display;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10379 int dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10380 int yb = window_text_bottom_y (w);
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 IF_DEBUG (debug_method_add (w, "twu2"));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10383
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10384 /* 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
10385 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
10386 first_reusable_row = start_row;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10387 while (first_reusable_row->enabled_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10388 && MATRIX_ROW_BOTTOM_Y (first_reusable_row) < yb
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10389 && (MATRIX_ROW_START_CHARPOS (first_reusable_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10390 < CHARPOS (new_start)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10391 ++first_reusable_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10392
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10393 /* Give up if there is no row to reuse. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10394 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
10395 || !first_reusable_row->enabled_p
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
10396 || (MATRIX_ROW_START_CHARPOS (first_reusable_row)
561aa7ea85a7 (unwind_redisplay): New. Resets flag redisplaying_p.
Gerd Moellmann <gerd@gnu.org>
parents: 25305
diff changeset
10397 != CHARPOS (new_start)))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10398 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10399
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10400 /* We can reuse fully visible rows beginning with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10401 first_reusable_row to the end of the window. Set
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10402 first_row_to_display to the first row that cannot be reused.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10403 Set pt_row to the row containing point, if there is any. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10404 first_row_to_display = first_reusable_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10405 pt_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10406 while (MATRIX_ROW_BOTTOM_Y (first_row_to_display) < yb)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10407 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10408 if (PT >= MATRIX_ROW_START_CHARPOS (first_row_to_display)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10409 && PT < MATRIX_ROW_END_CHARPOS (first_row_to_display))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10410 pt_row = first_row_to_display;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10411
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10412 ++first_row_to_display;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10413 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10414
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10415 /* Start displaying at the start of first_row_to_display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10416 xassert (first_row_to_display->y < yb);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10417 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
10418 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
10419 - start_vpos);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10420 it.vpos = (MATRIX_ROW_VPOS (first_row_to_display, w->current_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10421 - nrows_scrolled);
31849
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10422 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
10423 + WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10424
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10425 /* Display lines beginning with first_row_to_display in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10426 desired matrix. Set last_text_row to the last row displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10427 that displays text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10428 it.glyph_row = MATRIX_ROW (w->desired_matrix, it.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10429 if (pt_row == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10430 w->cursor.vpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10431 last_text_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10432 while (it.current_y < it.last_visible_y && !fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10433 if (display_line (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10434 last_text_row = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10435
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10436 /* Give up If point isn't in a row displayed or reused. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10437 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10438 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10439 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10440 return 0;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10443 /* 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
10444 position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10445 if (pt_row)
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 w->cursor.vpos -= MATRIX_ROW_VPOS (first_reusable_row,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10448 w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10449 w->cursor.y -= first_reusable_row->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10450 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10451
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10452 /* Scroll the display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10453 run.current_y = first_reusable_row->y;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10454 run.desired_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10455 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
10456 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
10457
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10458 if (run.height)
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 struct frame *f = XFRAME (WINDOW_FRAME (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10461 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10462 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
10463 rif->clear_mouse_face (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10464 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
10465 rif->update_window_end_hook (w, 0, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10466 update_end (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10467 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10468
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10469 /* Adjust Y positions of reused rows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10470 bottom_row = MATRIX_BOTTOM_TEXT_ROW (w->current_matrix, w);
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
10471 min_y = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10472 max_y = it.last_visible_y;
31849
07bedd9c5bdd (try_window_reusing_current_matrix): More fixes
Gerd Moellmann <gerd@gnu.org>
parents: 31845
diff changeset
10473 for (row = first_reusable_row; row < first_row_to_display; ++row)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10474 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10475 row->y -= dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10476 if (row->y < min_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10477 row->visible_height = row->height - (min_y - row->y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10478 else if (row->y + row->height > max_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10479 row->visible_height
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10480 = row->height - (row->y + row->height - max_y);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10481 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10482 row->visible_height = row->height;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10485 /* Disable rows not reused. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10486 while (row < bottom_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10487 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10488 row->enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10489 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10490 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10491
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10492 /* Scroll the current matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10493 xassert (nrows_scrolled > 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10494 rotate_matrix (w->current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10495 start_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10496 MATRIX_ROW_VPOS (bottom_row, w->current_matrix),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10497 -nrows_scrolled);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10498
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10499 /* Adjust window end. A null value of last_text_row means that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10500 the window end is in reused rows which in turn means that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10501 only its vpos can have changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10502 if (last_text_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10503 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10504 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10505 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10506 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10507 Z - MATRIX_ROW_END_CHARPOS (last_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10508 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10509 MATRIX_ROW_VPOS (last_text_row, w->desired_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10510 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10511 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10512 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10513 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10514 XFASTINT (w->window_end_vpos) - nrows_scrolled);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10515 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10516
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10517 w->window_end_valid = Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10518 w->desired_matrix->no_scrolling_p = 1;
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 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10521 debug_method_add (w, "try_window_reusing_current_matrix 2");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10522 #endif
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10523 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10524 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10525
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10526 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10527 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10530
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10531 /************************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10532 Window redisplay reusing current matrix when buffer has changed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10533 ************************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10534
32539
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10535 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
10536 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
10537 int *, int *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10538 static struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10539 find_last_row_displaying_text P_ ((struct glyph_matrix *, struct it *,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10540 struct glyph_row *));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10541
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10542
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10543 /* Return the last row in MATRIX displaying text. If row START is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10544 non-null, start searching with that row. IT gives the dimensions
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10545 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
10546 a pointer to the row found. */
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 static struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10549 find_last_row_displaying_text (matrix, it, start)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10550 struct glyph_matrix *matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10551 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10552 struct glyph_row *start;
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 struct glyph_row *row, *row_found;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10555
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10556 /* 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
10557 displaying text. The loop looks funny but think of partially
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10558 visible lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10559 row_found = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10560 row = start ? start : MATRIX_FIRST_TEXT_ROW (matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10561 while (MATRIX_ROW_DISPLAYS_TEXT_P (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10562 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10563 xassert (row->enabled_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10564 row_found = row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10565 if (MATRIX_ROW_BOTTOM_Y (row) >= it->last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10566 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10567 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10568 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10569
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10570 return row_found;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10571 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10572
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10573
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10574 /* 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
10575 by changes at the start of current_buffer that occurred since the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10576 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
10577
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10578 The global variable beg_unchanged has to contain the number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10579 bytes unchanged at the start of current_buffer. BEG +
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10580 beg_unchanged is the buffer position of the first changed byte in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10581 current_buffer. Characters at positions < BEG + beg_unchanged are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10582 at the same buffer positions as they were when the current matrix
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10583 was built. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10584
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10585 static struct glyph_row *
32539
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10586 find_last_unchanged_at_beg_row (w)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10587 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10588 {
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
10589 int first_changed_pos = BEG + BEG_UNCHANGED;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10590 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10591 struct glyph_row *row_found = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10592 int yb = window_text_bottom_y (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10593
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10594 /* Find the last row displaying unchanged text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10595 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10596 while (MATRIX_ROW_DISPLAYS_TEXT_P (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10597 && MATRIX_ROW_START_CHARPOS (row) < first_changed_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10598 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10599 if (/* If row ends before first_changed_pos, it is unchanged,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10600 except in some case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10601 MATRIX_ROW_END_CHARPOS (row) <= first_changed_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10602 /* 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
10603 unchanged. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10604 && !row->ends_at_zv_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10605 /* When first_changed_pos is the end of a continued line,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10606 row is not unchanged because it may be no longer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10607 continued. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10608 && !(MATRIX_ROW_END_CHARPOS (row) == first_changed_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10609 && row->continued_p))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10610 row_found = row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10611
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10612 /* Stop if last visible row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10613 if (MATRIX_ROW_BOTTOM_Y (row) >= yb)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10614 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10615
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10616 ++row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10617 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10618
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10619 return row_found;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10620 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10621
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10622
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10623 /* 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
10624 affected by changes at the end of current_buffer since the last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10625 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
10626 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
10627 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
10628 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
10629 exists, i.e. all rows are affected by changes. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10630
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10631 static struct glyph_row *
32539
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10632 find_first_unchanged_at_end_row (w, delta, delta_bytes)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10633 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10634 int *delta, *delta_bytes;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10635 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10636 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10637 struct glyph_row *row_found = NULL;
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 *delta = *delta_bytes = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10640
32539
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10641 /* 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
10642 is not up to date. */
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10643 if (NILP (w->window_end_valid))
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10644 abort ();
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10645
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10646 /* 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
10647 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
10648 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
10649 if (XFASTINT (w->window_end_pos) >= END_UNCHANGED)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10650 return NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10651
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10652 /* 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
10653 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10654
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10655 /* If matrix is entirely empty, no unchanged row exists. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10656 if (MATRIX_ROW_DISPLAYS_TEXT_P (row))
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 /* 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
10659 meaningful buffer position in it. The end position of row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10660 corresponds to window_end_pos. This allows us to translate
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10661 buffer positions in the current matrix to current buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10662 positions for characters not in changed text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10663 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
10664 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
10665 int last_unchanged_pos, last_unchanged_pos_old;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10666 struct glyph_row *first_text_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10667 = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10668
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10669 *delta = Z - Z_old;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10670 *delta_bytes = Z_BYTE - Z_BYTE_old;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10671
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10672 /* Set last_unchanged_pos to the buffer position of the last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10673 character in the buffer that has not been changed. Z is the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10674 index + 1 of the last byte in current_buffer, i.e. by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10675 subtracting end_unchanged we get the index of the last
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10676 unchanged character, and we have to add BEG to get its buffer
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10677 position. */
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
10678 last_unchanged_pos = Z - END_UNCHANGED + BEG;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10679 last_unchanged_pos_old = last_unchanged_pos - *delta;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10680
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10681 /* Search backward from ROW for a row displaying a line that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10682 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
10683 for (; row > first_text_row; --row)
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10684 {
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10685 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
10686 abort ();
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10687
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10688 if (MATRIX_ROW_START_CHARPOS (row) >= last_unchanged_pos_old)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10689 row_found = row;
32539
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10690 }
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10691 }
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10692
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10693 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
10694 abort ();
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10695
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10696 return row_found;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10697 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10698
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 that glyph rows in the current matrix of window W
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10701 reference the same glyph memory as corresponding rows in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10702 frame's frame matrix. This function is called after scrolling W's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10703 current matrix on a terminal frame in try_window_id and
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10704 try_window_reusing_current_matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10705
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10706 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10707 sync_frame_with_window_matrix_rows (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10708 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10709 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10710 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10711 struct glyph_row *window_row, *window_row_end, *frame_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10712
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10713 /* Preconditions: W must be a leaf window and full-width. Its frame
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10714 must have a frame matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10715 xassert (NILP (w->hchild) && NILP (w->vchild));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10716 xassert (WINDOW_FULL_WIDTH_P (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10717 xassert (!FRAME_WINDOW_P (f));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10718
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10719 /* 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
10720 have, by definition, to be the same as glyph pointers in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10721 corresponding frame matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10722 window_row = w->current_matrix->rows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10723 window_row_end = window_row + w->current_matrix->nrows;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10724 frame_row = f->current_matrix->rows + XFASTINT (w->top);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10725 while (window_row < window_row_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10726 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10727 int area;
25778
9a6099957160 (sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents: 25777
diff changeset
10728
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10729 for (area = LEFT_MARGIN_AREA; area <= LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10730 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
10731
9a6099957160 (sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents: 25777
diff changeset
10732 /* 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
10733 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
10734 if (!window_row->enabled_p)
9a6099957160 (sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents: 25777
diff changeset
10735 frame_row->enabled_p = 0;
9a6099957160 (sync_frame_with_window_matrix_rows): Disable frame rows
Gerd Moellmann <gerd@gnu.org>
parents: 25777
diff changeset
10736
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10737 ++window_row, ++frame_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10738 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10739 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10740
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10741
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10742 /* 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
10743 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
10744 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
10745 containing CHARPOS or null. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10746
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10747 static struct glyph_row *
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10748 row_containing_pos (w, charpos, start, end)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10749 struct window *w;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10750 int charpos;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10751 struct glyph_row *start, *end;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10752 {
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10753 struct glyph_row *row = start;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10754 int last_y;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10755
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10756 /* 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
10757 if (row->mode_line_p)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10758 ++row;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10759
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10760 if ((end && row >= end) || !row->enabled_p)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10761 return NULL;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10762
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10763 last_y = window_text_bottom_y (w);
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10764
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10765 while ((end == NULL || row < end)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10766 && (MATRIX_ROW_END_CHARPOS (row) < charpos
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10767 /* The end position of a row equals the start
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10768 position of the next row. If CHARPOS is there, we
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10769 would rather display it in the next line, except
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10770 when this line ends in ZV. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10771 || (MATRIX_ROW_END_CHARPOS (row) == charpos
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10772 && (MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10773 || !row->ends_at_zv_p)))
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10774 && MATRIX_ROW_BOTTOM_Y (row) < last_y)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10775 ++row;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10776
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10777 /* Give up if CHARPOS not found. */
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10778 if ((end && row >= end)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10779 || charpos < MATRIX_ROW_START_CHARPOS (row)
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10780 || charpos > MATRIX_ROW_END_CHARPOS (row))
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10781 row = NULL;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10782
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10783 return row;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10784 }
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10785
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
10786
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10787 /* Try to redisplay window W by reusing its existing display. W's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10788 current matrix must be up to date when this function is called,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10789 i.e. window_end_valid must not be nil.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10790
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10791 Value is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10792
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10793 1 if display has been updated
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10794 0 if otherwise unsuccessful
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10795 -1 if redisplay with same window start is known not to succeed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10796
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10797 The following steps are performed:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10798
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10799 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
10800 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
10801 is found, give up.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10802
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10803 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
10804 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
10805
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10806 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
10807 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
10808 the window.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10809
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10810 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
10811
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10812 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
10813 display and current matrix as needed.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10814
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10815 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
10816 happen under various circumstances, like a partially visible line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10817 becoming fully visible, or because newly displayed lines are displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10818 in smaller font sizes.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10819
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10820 7. Update W's window end information. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10821
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10822 /* Check that window end is what we expect it to be. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10823
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10824 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10825 try_window_id (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10826 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10827 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10828 struct frame *f = XFRAME (w->frame);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10829 struct glyph_matrix *current_matrix = w->current_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10830 struct glyph_matrix *desired_matrix = w->desired_matrix;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10831 struct glyph_row *last_unchanged_at_beg_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10832 struct glyph_row *first_unchanged_at_end_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10833 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10834 struct glyph_row *bottom_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10835 int bottom_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10836 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10837 int delta = 0, delta_bytes = 0, stop_pos, dvpos, dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10838 struct text_pos start_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10839 struct run run;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10840 int first_unchanged_at_end_vpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10841 struct glyph_row *last_text_row, *last_text_row_at_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10842 struct text_pos start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10843
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10844 SET_TEXT_POS_FROM_MARKER (start, w->start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10845
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10846 /* Check pre-conditions. Window end must be valid, otherwise
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10847 the current matrix would not be up to date. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10848 xassert (!NILP (w->window_end_valid));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10849 xassert (FRAME_WINDOW_P (XFRAME (w->frame))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10850 || (line_ins_del_ok && WINDOW_FULL_WIDTH_P (w)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10851
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10852 /* 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
10853 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
10854 initially at Z for freshly visited files. The code below would
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10855 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
10856 if (MODIFF > SAVE_MODIFF
723662ab7db4 (try_window_id): Recompute unchanged information if
Gerd Moellmann <gerd@gnu.org>
parents: 27897
diff changeset
10857 /* 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
10858 || BEG_UNCHANGED + END_UNCHANGED > Z_BYTE)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10859 {
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
10860 if (GPT - BEG < BEG_UNCHANGED)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
10861 BEG_UNCHANGED = GPT - BEG;
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
10862 if (Z - GPT < END_UNCHANGED)
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
10863 END_UNCHANGED = Z - GPT;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10864 }
27540
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
10865
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10866 /* 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
10867 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
10868 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
10869 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
10870 be adjusted, of course. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10871 row = MATRIX_ROW (w->current_matrix, XFASTINT (w->window_end_vpos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10872 if (CHARPOS (start) > BEGV
25377
d32d09a601e8 (redisplay_internal): Clear garbaged frames after
Gerd Moellmann <gerd@gnu.org>
parents: 25362
diff changeset
10873 && Z - END_UNCHANGED < CHARPOS (start) - 1
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10874 && FETCH_BYTE (BYTEPOS (start) - 1) == '\n'
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10875 && PT < MATRIX_ROW_END_CHARPOS (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10876 {
28709
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10877 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
10878 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
10879
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10880 if (delta)
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10881 {
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10882 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
10883 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
10884
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10885 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
10886 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
10887 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
10888 delta, delta_bytes);
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10889 }
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10890
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10891 #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
10892 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
10893 changed. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10894 w->window_end_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10895 = make_number (Z - MATRIX_ROW_END_CHARPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10896 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
10897 = 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
10898 #endif
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
10899
34438
524c7ecc8ef4 (try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents: 34288
diff changeset
10900 row = row_containing_pos (w, PT, r0, NULL);
524c7ecc8ef4 (try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents: 34288
diff changeset
10901 if (row == NULL)
524c7ecc8ef4 (try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents: 34288
diff changeset
10902 return 0;
524c7ecc8ef4 (try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents: 34288
diff changeset
10903
524c7ecc8ef4 (try_window_id) <all changes above window start>:
Gerd Moellmann <gerd@gnu.org>
parents: 34288
diff changeset
10904 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
10905 return 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10906 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10907
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10908 /* Return quickly if changes are all below what is displayed in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10909 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
10910 if (BEG_UNCHANGED > MATRIX_ROW_END_CHARPOS (row)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10911 && PT < MATRIX_ROW_END_CHARPOS (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10912 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10913 /* We have to update window end positions because the buffer's
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10914 size has changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10915 w->window_end_pos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10916 = make_number (Z - MATRIX_ROW_END_CHARPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10917 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
10918 = 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
10919
8dc78ef485a4 (try_window_id): If changes are all below what is
Gerd Moellmann <gerd@gnu.org>
parents: 29981
diff changeset
10920 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
10921 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
10922 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
10923 return 2;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10924 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10925
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10926 /* Check that window start agrees with the start of the first glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10927 row in its current matrix. Check this after we know the window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10928 start is not in changed text, otherwise positions would not be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10929 comparable. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10930 row = MATRIX_FIRST_TEXT_ROW (w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10931 if (!TEXT_POS_EQUAL_P (start, row->start.pos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10932 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10933
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10934 /* Compute the position at which we have to start displaying new
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10935 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
10936 reusable because they are not displaying changed text. Find the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10937 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
10938 start of current_buffer. Value is null if changes start in the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10939 first line of window. */
32539
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10940 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
10941 if (last_unchanged_at_beg_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10942 {
33898
93b22ccc23e2 (try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents: 33863
diff changeset
10943 /* 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
10944 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
10945 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
10946 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
10947 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
10948 && 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
10949 --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
10950
93b22ccc23e2 (try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents: 33863
diff changeset
10951 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
10952 return 0;
93b22ccc23e2 (try_window_id): Avoid starting to display in the moddle
Gerd Moellmann <gerd@gnu.org>
parents: 33863
diff changeset
10953
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10954 init_to_row_end (&it, w, last_unchanged_at_beg_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10955 start_pos = it.current.pos;
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 /* Start displaying new lines in the desired matrix at the same
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10958 vpos we would use in the current matrix, i.e. below
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10959 last_unchanged_at_beg_row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10960 it.vpos = 1 + MATRIX_ROW_VPOS (last_unchanged_at_beg_row,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10961 current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10962 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10963 it.current_y = MATRIX_ROW_BOTTOM_Y (last_unchanged_at_beg_row);
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 xassert (it.hpos == 0 && it.current_x == 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10966 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10967 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10968 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10969 /* There are no reusable lines at the start of the window.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10970 Start displaying in the first line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10971 start_display (&it, w, start);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10972 start_pos = it.current.pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10973 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10974
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10975 /* 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
10976 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
10977 which case we must redisplay to the end of the window. delta
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10978 will be set to the value by which buffer positions beginning with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10979 first_unchanged_at_end_row have to be adjusted due to text
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10980 changes. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10981 first_unchanged_at_end_row
32539
dd4c7d5e1599 (find_last_unchanged_at_beg_row): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 32532
diff changeset
10982 = find_first_unchanged_at_end_row (w, &delta, &delta_bytes);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10983 IF_DEBUG (debug_delta = delta);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10984 IF_DEBUG (debug_delta_bytes = delta_bytes);
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 /* 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
10987 display new lines. If first_unchanged_at_end_row != NULL, this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10988 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
10989 row. For first_unchanged_at_end_row == NULL, use 0 to indicate
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10990 that we don't stop at a buffer position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10991 stop_pos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10992 if (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10993 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10994 xassert (last_unchanged_at_beg_row == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10995 || first_unchanged_at_end_row >= last_unchanged_at_beg_row);
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 /* If this is a continuation line, move forward to the next one
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10998 that isn't. Changes in lines above affect this line.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
10999 Caution: this may move first_unchanged_at_end_row to a row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11000 not displaying text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11001 while (MATRIX_ROW_CONTINUATION_LINE_P (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11002 && MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11003 && (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11004 < it.last_visible_y))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11005 ++first_unchanged_at_end_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11006
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11007 if (!MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11008 || (MATRIX_ROW_BOTTOM_Y (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11009 >= it.last_visible_y))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11010 first_unchanged_at_end_row = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11011 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11012 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11013 stop_pos = (MATRIX_ROW_START_CHARPOS (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11014 + delta);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11015 first_unchanged_at_end_vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11016 = 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
11017 xassert (stop_pos >= Z - END_UNCHANGED);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11018 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11019 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11020 else if (last_unchanged_at_beg_row == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11021 return 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11022
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11023
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11024 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11025
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11026 /* 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
11027 now displays text. This is a necessary condition for the window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11028 end pos calculation at the end of this function. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11029 xassert (first_unchanged_at_end_row == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11030 || MATRIX_ROW_DISPLAYS_TEXT_P (first_unchanged_at_end_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11031
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11032 debug_last_unchanged_at_beg_vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11033 = (last_unchanged_at_beg_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11034 ? MATRIX_ROW_VPOS (last_unchanged_at_beg_row, current_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11035 : -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11036 debug_first_unchanged_at_end_vpos = first_unchanged_at_end_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11037
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11038 #endif /* GLYPH_DEBUG != 0 */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11039
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11040
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11041 /* Display new lines. Set last_text_row to the last new line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11042 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
11043 line where the window_end_vpos is. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11044 w->cursor.vpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11045 last_text_row = NULL;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11046 overlay_arrow_seen = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11047 while (it.current_y < it.last_visible_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11048 && !fonts_changed_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11049 && (first_unchanged_at_end_row == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11050 || IT_CHARPOS (it) < stop_pos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11051 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11052 if (display_line (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11053 last_text_row = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11054 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11055
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11056 if (fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11057 return -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11058
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11059
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11060 /* Compute differences in buffer positions, y-positions etc. for
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11061 lines reused at the bottom of the window. Compute what we can
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11062 scroll. */
25493
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
11063 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
11064 /* 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
11065 bottom of the window. */
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
11066 && it.current_y < it.last_visible_y)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11067 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11068 dvpos = (it.vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11069 - MATRIX_ROW_VPOS (first_unchanged_at_end_row,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11070 current_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11071 dy = it.current_y - first_unchanged_at_end_row->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11072 run.current_y = first_unchanged_at_end_row->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11073 run.desired_y = run.current_y + dy;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11074 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
11075 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11076 else
25493
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
11077 {
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
11078 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
11079 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
11080 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11081 IF_DEBUG (debug_dvpos = dvpos; debug_dy = dy);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11082
25394
ed9fe1a2c8ae (try_window_id): Remove typo.
Gerd Moellmann <gerd@gnu.org>
parents: 25393
diff changeset
11083
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11084 /* Find the cursor if not already found. We have to decide whether
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11085 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
11086 not a very frequent case.) This decision has to be made before
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11087 the current matrix is altered. A value of cursor.vpos < 0 means
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11088 that PT is either in one of the lines beginning at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11089 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
11090 lines that might be displayed later at the window end; as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11091 mentioned, this is not a frequent case. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11092 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11093 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11094 /* Cursor in unchanged rows at the top? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11095 if (PT < CHARPOS (start_pos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11096 && last_unchanged_at_beg_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11097 {
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
11098 row = row_containing_pos (w, PT,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
11099 MATRIX_FIRST_TEXT_ROW (w->current_matrix),
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
11100 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
11101 if (row)
900897103eb2 (try_window_id): When trying to locate cursor in
Gerd Moellmann <gerd@gnu.org>
parents: 31338
diff changeset
11102 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
11103 }
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 /* Start from first_unchanged_at_end_row looking for PT. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11106 else if (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11107 {
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
11108 row = row_containing_pos (w, PT - delta,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
11109 first_unchanged_at_end_row, NULL);
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
11110 if (row)
25393
9aff86718a20 (try_window_id): Recognize case that PT == ZV and in
Gerd Moellmann <gerd@gnu.org>
parents: 25388
diff changeset
11111 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
11112 delta_bytes, dy, dvpos);
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11115 /* Give up if cursor was not found. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11116 if (w->cursor.vpos < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11117 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11118 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11119 return -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11120 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11121 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11122
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11123 /* Don't let the cursor end in the scroll margins. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11124 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11125 int this_scroll_margin, cursor_height;
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 this_scroll_margin = max (0, scroll_margin);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11128 this_scroll_margin = min (this_scroll_margin,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11129 XFASTINT (w->height) / 4);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11130 this_scroll_margin *= CANON_Y_UNIT (it.f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11131 cursor_height = MATRIX_ROW (w->desired_matrix, w->cursor.vpos)->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11132
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11133 if ((w->cursor.y < this_scroll_margin
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11134 && CHARPOS (start) > BEGV)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11135 /* Don't take scroll margin into account at the bottom because
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11136 old redisplay didn't do it either. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11137 || w->cursor.y + cursor_height > it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11138 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11139 w->cursor.vpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11140 clear_glyph_matrix (w->desired_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11141 return -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11142 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11143 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11144
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11145 /* Scroll the display. Do it before changing the current matrix so
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11146 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
11147 found. */
28539
918f12c5c8e3 (setup_echo_area_for_printing): Choose an echo
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
11148 if (dy && run.height)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11149 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11150 update_begin (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11151
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11152 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11153 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11154 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
11155 rif->clear_mouse_face (w);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11156 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
11157 rif->update_window_end_hook (w, 0, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11158 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11159 else
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 /* Terminal frame. In this case, dvpos gives the number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11162 lines to scroll by; dvpos < 0 means scroll up. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11163 int first_unchanged_at_end_vpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11164 = MATRIX_ROW_VPOS (first_unchanged_at_end_row, w->current_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11165 int from = XFASTINT (w->top) + first_unchanged_at_end_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11166 int end = XFASTINT (w->top) + window_internal_height (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11167
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11168 /* Perform the operation on the screen. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11169 if (dvpos > 0)
6684
b5dc04567426 (display_text_line): Rename startp to leftmargin.
Richard M. Stallman <rms@gnu.org>
parents: 6661
diff changeset
11170 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11171 /* Scroll last_unchanged_at_beg_row to the end of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11172 window down dvpos lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11173 set_terminal_window (end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11174
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11175 /* On dumb terminals delete dvpos lines at the end
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11176 before inserting dvpos empty lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11177 if (!scroll_region_ok)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11178 ins_del_lines (end - dvpos, -dvpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11179
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11180 /* Insert dvpos empty lines in front of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11181 last_unchanged_at_beg_row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11182 ins_del_lines (from, dvpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11183 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11184 else if (dvpos < 0)
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 /* Scroll up last_unchanged_at_beg_vpos to the end of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11187 the window to last_unchanged_at_beg_vpos - |dvpos|. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11188 set_terminal_window (end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11189
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11190 /* Delete dvpos lines in front of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11191 last_unchanged_at_beg_vpos. ins_del_lines will set
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11192 the cursor to the given vpos and emit |dvpos| delete
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11193 line sequences. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11194 ins_del_lines (from + dvpos, dvpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11195
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11196 /* On a dumb terminal insert dvpos empty lines at the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11197 end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11198 if (!scroll_region_ok)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11199 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
11200 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11201
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11202 set_terminal_window (0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11203 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11204
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11205 update_end (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11206 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11207
25493
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
11208 /* 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
11209 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
11210 text. */
28588533d342 (try_window_id): Reset first_unchanged_at_end_row
Gerd Moellmann <gerd@gnu.org>
parents: 25463
diff changeset
11211 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
11212 bottom_vpos = MATRIX_ROW_VPOS (bottom_row, current_matrix);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11213 if (dvpos < 0)
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 rotate_matrix (current_matrix, first_unchanged_at_end_vpos + dvpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11216 bottom_vpos, dvpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11217 enable_glyph_matrix_rows (current_matrix, bottom_vpos + dvpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11218 bottom_vpos, 0);
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 else if (dvpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11221 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11222 rotate_matrix (current_matrix, first_unchanged_at_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11223 bottom_vpos, dvpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11224 enable_glyph_matrix_rows (current_matrix, first_unchanged_at_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11225 first_unchanged_at_end_vpos + dvpos, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11226 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11227
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11228 /* For frame-based redisplay, make sure that current frame and window
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11229 matrix are in sync with respect to glyph memory. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11230 if (!FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11231 sync_frame_with_window_matrix_rows (w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11232
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11233 /* Adjust buffer positions in reused rows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11234 if (delta)
28709
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
11235 increment_matrix_positions (current_matrix,
7606937fa891 (try_window_id) <all changes above window start>: Adjust
Gerd Moellmann <gerd@gnu.org>
parents: 28692
diff changeset
11236 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
11237 bottom_vpos, delta, delta_bytes);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11238
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11239 /* Adjust Y positions. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11240 if (dy)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11241 shift_glyph_matrix (w, current_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11242 first_unchanged_at_end_vpos + dvpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11243 bottom_vpos, dy);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11244
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11245 if (first_unchanged_at_end_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11246 first_unchanged_at_end_row += dvpos;
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 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
11249 the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11250 last_text_row_at_end = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11251 if (dy < 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11252 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11253 /* 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
11254 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
11255 the matrix by dvpos. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11256 int last_vpos = XFASTINT (w->window_end_vpos) + dvpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11257 struct glyph_row *last_row = MATRIX_ROW (current_matrix, last_vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11258
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11259 /* If last_row is the window end line, it should display text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11260 xassert (last_row->displays_text_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11261
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11262 /* If window end line was partially visible before, begin
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11263 displaying at that line. Otherwise begin displaying with the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11264 line following it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11265 if (MATRIX_ROW_BOTTOM_Y (last_row) - dy >= it.last_visible_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11266 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11267 init_to_row_start (&it, w, last_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11268 it.vpos = last_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11269 it.current_y = last_row->y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11270 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11271 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11272 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11273 init_to_row_end (&it, w, last_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11274 it.vpos = 1 + last_vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11275 it.current_y = MATRIX_ROW_BOTTOM_Y (last_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11276 ++last_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11277 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11278
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11279 /* 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
11280 the right continuation_lines_width and current_x. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11281 it.continuation_lines_width = last_row->continuation_lines_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11282 it.hpos = it.current_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11283
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11284 /* Display the rest of the lines at the window end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11285 it.glyph_row = MATRIX_ROW (desired_matrix, it.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11286 while (it.current_y < it.last_visible_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11287 && !fonts_changed_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11288 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11289 /* Is it always sure that the display agrees with lines in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11290 the current matrix? I don't think so, so we mark rows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11291 displayed invalid in the current matrix by setting their
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11292 enabled_p flag to zero. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11293 MATRIX_ROW (w->current_matrix, it.vpos)->enabled_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11294 if (display_line (&it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11295 last_text_row_at_end = it.glyph_row - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11296 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11297 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11298
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11299 /* Update window_end_pos and window_end_vpos. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11300 if (first_unchanged_at_end_row
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11301 && first_unchanged_at_end_row->y < it.last_visible_y
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11302 && !last_text_row_at_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11303 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11304 /* Window end line if one of the preserved rows from the current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11305 matrix. Set row to the last row displaying text in current
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11306 matrix starting at first_unchanged_at_end_row, after
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11307 scrolling. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11308 xassert (first_unchanged_at_end_row->displays_text_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11309 row = find_last_row_displaying_text (w->current_matrix, &it,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11310 first_unchanged_at_end_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11311 xassert (row && MATRIX_ROW_DISPLAYS_TEXT_P (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11312
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11313 XSETFASTINT (w->window_end_pos, Z - MATRIX_ROW_END_CHARPOS (row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11314 w->window_end_bytepos = Z_BYTE - MATRIX_ROW_END_BYTEPOS (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11315 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11316 MATRIX_ROW_VPOS (row, w->current_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11317 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11318 else if (last_text_row_at_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11319 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11320 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11321 Z - MATRIX_ROW_END_CHARPOS (last_text_row_at_end));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11322 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11323 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row_at_end);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11324 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11325 MATRIX_ROW_VPOS (last_text_row_at_end, desired_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11326 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11327 else if (last_text_row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11328 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11329 /* 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
11330 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
11331 in the desired matrix. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11332 XSETFASTINT (w->window_end_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11333 Z - MATRIX_ROW_END_CHARPOS (last_text_row));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11334 w->window_end_bytepos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11335 = Z_BYTE - MATRIX_ROW_END_BYTEPOS (last_text_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11336 XSETFASTINT (w->window_end_vpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11337 MATRIX_ROW_VPOS (last_text_row, desired_matrix));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11338 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11339 else if (first_unchanged_at_end_row == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11340 && last_text_row == NULL
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11341 && last_text_row_at_end == NULL)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11342 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11343 /* Displayed to end of window, but no line containing text was
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11344 displayed. Lines were deleted at the end of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11345 int vpos;
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11346 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
11347
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11348 for (vpos = XFASTINT (w->window_end_vpos); vpos > 0; --vpos)
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11349 if ((w->desired_matrix->rows[vpos + header_line_p].enabled_p
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11350 && w->desired_matrix->rows[vpos + header_line_p].displays_text_p)
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11351 || (!w->desired_matrix->rows[vpos + header_line_p].enabled_p
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11352 && w->current_matrix->rows[vpos + header_line_p].displays_text_p))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11353 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11354
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11355 w->window_end_vpos = make_number (vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11356 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11357 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11358 abort ();
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11359
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11360 IF_DEBUG (debug_end_pos = XFASTINT (w->window_end_pos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11361 debug_end_vpos = XFASTINT (w->window_end_vpos));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11362
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11363 /* Record that display has not been completed. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11364 w->window_end_valid = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11365 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
11366 return 3;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11367 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11368
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11369
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 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11372 More debugging support
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 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11376
34789
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11377 void dump_glyph_row P_ ((struct glyph_matrix *, int, int));
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11378 void dump_glyph_matrix P_ ((struct glyph_matrix *, int));
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11379
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11380
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11381 /* Dump the contents of glyph matrix MATRIX on stderr.
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11382
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11383 GLYPHS 0 means don't show glyph contents.
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11384 GLYPHS 1 means show glyphs in short form
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11385 GLYPHS > 1 means show glyphs in long form. */
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11386
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11387 void
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11388 dump_glyph_matrix (matrix, glyphs)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11389 struct glyph_matrix *matrix;
34789
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11390 int glyphs;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11391 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11392 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11393 for (i = 0; i < matrix->nrows; ++i)
34789
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11394 dump_glyph_row (matrix, i, glyphs);
25012
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 /* Dump the contents of glyph row at VPOS in MATRIX to stderr.
34789
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11399 GLYPHS 0 means don't show glyph contents.
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11400 GLYPHS 1 means show glyphs in short form
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11401 GLYPHS > 1 means show glyphs in long form. */
25012
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 void
34789
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11404 dump_glyph_row (matrix, vpos, glyphs)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11405 struct glyph_matrix *matrix;
34789
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11406 int vpos, glyphs;
25012
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 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11409
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11410 if (vpos < 0 || vpos >= matrix->nrows)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11411 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11412
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11413 row = MATRIX_ROW (matrix, vpos);
34789
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11414
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11415 if (glyphs != 1)
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11416 {
35267
5695de532559 (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents: 35246
diff changeset
11417 fprintf (stderr, "Row Start End Used oEI><O\\CTZFesm X Y W H V A P\n");
34789
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11418 fprintf (stderr, "=======================================================================\n");
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11419
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11420 fprintf (stderr, "%3d %5d %5d %4d %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d\
35267
5695de532559 (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents: 35246
diff changeset
11421 %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d %4d %4d %4d %4d %4d %4d %4d\n",
34789
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11422 row - matrix->rows,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11423 MATRIX_ROW_START_CHARPOS (row),
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11424 MATRIX_ROW_END_CHARPOS (row),
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11425 row->used[TEXT_AREA],
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11426 row->contains_overlapping_glyphs_p,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11427 row->enabled_p,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11428 row->inverse_p,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11429 row->truncated_on_left_p,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11430 row->truncated_on_right_p,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11431 row->overlay_arrow_p,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11432 row->continued_p,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11433 MATRIX_ROW_CONTINUATION_LINE_P (row),
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11434 row->displays_text_p,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11435 row->ends_at_zv_p,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11436 row->fill_line_p,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11437 row->ends_in_middle_of_char_p,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11438 row->starts_in_middle_of_char_p,
35267
5695de532559 (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents: 35246
diff changeset
11439 row->mouse_face_p,
34789
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11440 row->x,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11441 row->y,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11442 row->pixel_width,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11443 row->height,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11444 row->visible_height,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11445 row->ascent,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11446 row->phys_ascent);
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11447 fprintf (stderr, "%9d %5d\n", row->start.overlay_string_index,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11448 row->end.overlay_string_index);
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11449 fprintf (stderr, "%9d %5d\n",
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11450 CHARPOS (row->start.string_pos),
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11451 CHARPOS (row->end.string_pos));
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11452 fprintf (stderr, "%9d %5d\n", row->start.dpvec_index,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11453 row->end.dpvec_index);
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11454 }
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11455
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11456 if (glyphs > 1)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11457 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11458 struct glyph *glyph, *glyph_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11459 int prev_had_glyphs_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11460
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11461 glyph = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11462 glyph_end = glyph + row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11463
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11464 /* Glyph for a line end in text. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11465 if (glyph == glyph_end && glyph->charpos > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11466 ++glyph_end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11467
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11468 if (glyph < glyph_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11469 {
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11470 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
11471 prev_had_glyphs_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11472 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11473 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11474 prev_had_glyphs_p = 0;
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 while (glyph < glyph_end)
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 if (glyph->type == CHAR_GLYPH)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11479 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11480 fprintf (stderr,
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11481 " %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
11482 glyph - row->glyphs[TEXT_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11483 'C',
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11484 glyph->charpos,
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11485 (BUFFERP (glyph->object)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11486 ? 'B'
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11487 : (STRINGP (glyph->object)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11488 ? 'S'
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11489 : '-')),
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11490 glyph->pixel_width,
27000
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
11491 glyph->u.ch,
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
11492 (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
11493 ? glyph->u.ch
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11494 : '.'),
27000
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
11495 glyph->face_id,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11496 glyph->left_box_line_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11497 glyph->right_box_line_p);
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 else if (glyph->type == STRETCH_GLYPH)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11500 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11501 fprintf (stderr,
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11502 " %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
11503 glyph - row->glyphs[TEXT_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11504 'S',
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11505 glyph->charpos,
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11506 (BUFFERP (glyph->object)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11507 ? 'B'
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11508 : (STRINGP (glyph->object)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11509 ? 'S'
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11510 : '-')),
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11511 glyph->pixel_width,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11512 0,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11513 '.',
27015
526f3b2398ce (dump_glyph_row): Adapt to changes in struct glyph.
Gerd Moellmann <gerd@gnu.org>
parents: 27011
diff changeset
11514 glyph->face_id,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11515 glyph->left_box_line_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11516 glyph->right_box_line_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11517 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11518 else if (glyph->type == IMAGE_GLYPH)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11519 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11520 fprintf (stderr,
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11521 " %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
11522 glyph - row->glyphs[TEXT_AREA],
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11523 'I',
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11524 glyph->charpos,
29817
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11525 (BUFFERP (glyph->object)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11526 ? 'B'
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11527 : (STRINGP (glyph->object)
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11528 ? 'S'
6c3a17ddb763 (single_display_prop_intangible_p)
Gerd Moellmann <gerd@gnu.org>
parents: 29748
diff changeset
11529 : '-')),
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11530 glyph->pixel_width,
27000
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
11531 glyph->u.img_id,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11532 '.',
27015
526f3b2398ce (dump_glyph_row): Adapt to changes in struct glyph.
Gerd Moellmann <gerd@gnu.org>
parents: 27011
diff changeset
11533 glyph->face_id,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11534 glyph->left_box_line_p,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11535 glyph->right_box_line_p);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11536 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11537 ++glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11538 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11539 }
34789
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11540 else if (glyphs == 1)
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11541 {
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11542 char *s = (char *) alloca (row->used[TEXT_AREA] + 1);
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11543 int i;
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11544
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11545 for (i = 0; i < row->used[TEXT_AREA]; ++i)
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11546 {
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11547 struct glyph *glyph = row->glyphs[TEXT_AREA] + i;
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11548 if (glyph->type == CHAR_GLYPH
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11549 && glyph->u.ch < 0x80
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11550 && glyph->u.ch >= ' ')
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11551 s[i] = glyph->u.ch;
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11552 else
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11553 s[i] = '.';
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11554 }
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11555
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11556 s[i] = '\0';
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11557 fprintf (stderr, "%3d: (%d) '%s'\n", vpos, row->enabled_p, s);
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11558 }
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11561
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11562 DEFUN ("dump-glyph-matrix", Fdump_glyph_matrix,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11563 Sdump_glyph_matrix, 0, 1, "p",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11564 "Dump the current matrix of the selected window to stderr.\n\
34789
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11565 Shows contents of glyph row structures. With non-nil\n\
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11566 parameter GLYPHS, dump glyphs as well. If GLYPHS is 1 show\n\
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11567 glyphs in short form, otherwise show glyphs in long form.")
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11568 (glyphs)
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11569 Lisp_Object glyphs;
25012
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 struct window *w = XWINDOW (selected_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11572 struct buffer *buffer = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11573
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11574 fprintf (stderr, "PT = %d, BEGV = %d. ZV = %d\n",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11575 BUF_PT (buffer), BUF_BEGV (buffer), BUF_ZV (buffer));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11576 fprintf (stderr, "Cursor x = %d, y = %d, hpos = %d, vpos = %d\n",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11577 w->cursor.x, w->cursor.y, w->cursor.hpos, w->cursor.vpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11578 fprintf (stderr, "=============================================\n");
34789
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11579 dump_glyph_matrix (w->current_matrix,
7ebf09eda05e (dump_glyph_row, dump_glyph_matrix, Fdump_glyph_matrix)
Gerd Moellmann <gerd@gnu.org>
parents: 34748
diff changeset
11580 NILP (glyphs) ? 0 : XINT (glyphs));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11581 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11582 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11583
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11584
34801
803bee3aa2bd (Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents: 34789
diff changeset
11585 DEFUN ("dump-glyph-row", Fdump_glyph_row, Sdump_glyph_row, 1, 2, "",
803bee3aa2bd (Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents: 34789
diff changeset
11586 "Dump glyph row ROW to stderr.\n\
803bee3aa2bd (Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents: 34789
diff changeset
11587 GLYPH 0 means don't dump glyphs.\n\
803bee3aa2bd (Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents: 34789
diff changeset
11588 GLYPH 1 means dump glyphs in short form.\n\
34802
d0237aa9a10d Fix a typo.
Gerd Moellmann <gerd@gnu.org>
parents: 34801
diff changeset
11589 GLYPH > 1 or omitted means dump glyphs in long form.")
34801
803bee3aa2bd (Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents: 34789
diff changeset
11590 (row, glyphs)
803bee3aa2bd (Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents: 34789
diff changeset
11591 Lisp_Object row, glyphs;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11592 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11593 CHECK_NUMBER (row, 0);
34801
803bee3aa2bd (Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents: 34789
diff changeset
11594 dump_glyph_row (XWINDOW (selected_window)->current_matrix,
803bee3aa2bd (Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents: 34789
diff changeset
11595 XINT (row),
803bee3aa2bd (Fdump_glyph_row) [GLYPH_DEBUG]: Add optional arg
Gerd Moellmann <gerd@gnu.org>
parents: 34789
diff changeset
11596 INTEGERP (glyphs) ? XINT (glyphs) : 2);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11597 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11598 }
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
35267
5695de532559 (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents: 35246
diff changeset
11601 DEFUN ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row, 1, 2, "",
5695de532559 (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents: 35246
diff changeset
11602 "Dump glyph row ROW of the tool-bar of the current frame to stderr.\n\
5695de532559 (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents: 35246
diff changeset
11603 GLYPH 0 means don't dump glyphs.\n\
5695de532559 (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents: 35246
diff changeset
11604 GLYPH 1 means dump glyphs in short form.\n\
5695de532559 (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents: 35246
diff changeset
11605 GLYPH > 1 or omitted means dump glyphs in long form.")
5695de532559 (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents: 35246
diff changeset
11606 (row, glyphs)
5695de532559 (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents: 35246
diff changeset
11607 Lisp_Object row, glyphs;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11608 {
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
11609 struct frame *sf = SELECTED_FRAME ();
35267
5695de532559 (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents: 35246
diff changeset
11610 struct glyph_matrix *m = (XWINDOW (sf->tool_bar_window)->current_matrix);
5695de532559 (Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
Gerd Moellmann <gerd@gnu.org>
parents: 35246
diff changeset
11611 dump_glyph_row (m, XINT (row), INTEGERP (glyphs) ? XINT (glyphs) : 2);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11612 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11613 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11614
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11615
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11616 DEFUN ("trace-redisplay-toggle", Ftrace_redisplay_toggle,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11617 Strace_redisplay_toggle, 0, 0, "",
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11618 "Toggle tracing of redisplay.")
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11619 ()
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11620 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11621 trace_redisplay_p = !trace_redisplay_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11622 return Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11623 }
27540
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11624
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11625
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11626 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
11627 "Print STRING to stderr.")
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11628 (string)
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11629 Lisp_Object string;
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11630 {
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11631 CHECK_STRING (string, 0);
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11632 fprintf (stderr, "%s", XSTRING (string)->data);
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11633 return Qnil;
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
11634 }
25012
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 #endif /* GLYPH_DEBUG */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11637
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11638
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11639
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11640 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11641 Building Desired Matrix Rows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11642 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11643
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11644 /* Return a temporary glyph row holding the glyphs of an overlay
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11645 arrow. Only used for non-window-redisplay windows. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11646
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11647 static struct glyph_row *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11648 get_overlay_arrow_glyph_row (w)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11649 struct window *w;
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 struct frame *f = XFRAME (WINDOW_FRAME (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11652 struct buffer *buffer = XBUFFER (w->buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11653 struct buffer *old = current_buffer;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11654 unsigned char *arrow_string = XSTRING (Voverlay_arrow_string)->data;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11655 int arrow_len = XSTRING (Voverlay_arrow_string)->size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11656 unsigned char *arrow_end = arrow_string + arrow_len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11657 unsigned char *p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11658 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11659 int multibyte_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11660 int n_glyphs_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11661
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11662 set_buffer_temp (buffer);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11663 init_iterator (&it, w, -1, -1, &scratch_glyph_row, DEFAULT_FACE_ID);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11664 it.glyph_row->used[TEXT_AREA] = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11665 SET_TEXT_POS (it.position, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11666
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11667 multibyte_p = !NILP (buffer->enable_multibyte_characters);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11668 p = arrow_string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11669 while (p < arrow_end)
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 Lisp_Object face, ilisp;
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 /* Get the next character. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11674 if (multibyte_p)
25096
1af1088d3812 (string_char_and_length): New. Use it everywhere
Gerd Moellmann <gerd@gnu.org>
parents: 25063
diff changeset
11675 it.c = string_char_and_length (p, arrow_len, &it.len);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11676 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11677 it.c = *p, it.len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11678 p += it.len;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11679
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11680 /* Get its face. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11681 XSETFASTINT (ilisp, p - arrow_string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11682 face = Fget_text_property (ilisp, Qface, Voverlay_arrow_string);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11683 it.face_id = compute_char_face (f, it.c, face);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11684
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11685 /* Compute its width, get its glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11686 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
11687 SET_TEXT_POS (it.position, -1, -1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11688 PRODUCE_GLYPHS (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11689
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11690 /* 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
11691 to remove some glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11692 if (it.current_x > it.last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11693 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11694 it.glyph_row->used[TEXT_AREA] = n_glyphs_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11695 break;
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 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11698
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11699 set_buffer_temp (old);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11700 return it.glyph_row;
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
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 /* Insert truncation glyphs at the start of IT->glyph_row. Truncation
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11705 glyphs are only inserted for terminal frames since we can't really
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11706 win with truncation glyphs when partially visible glyphs are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11707 involved. Which glyphs to insert is determined by
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11708 produce_special_glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11709
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11710 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11711 insert_left_trunc_glyphs (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11712 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11713 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11714 struct it truncate_it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11715 struct glyph *from, *end, *to, *toend;
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 xassert (!FRAME_WINDOW_P (it->f));
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 /* Get the truncation glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11720 truncate_it = *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11721 truncate_it.current_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11722 truncate_it.face_id = DEFAULT_FACE_ID;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11723 truncate_it.glyph_row = &scratch_glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11724 truncate_it.glyph_row->used[TEXT_AREA] = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11725 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
11726 truncate_it.object = make_number (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11727 produce_special_glyphs (&truncate_it, IT_TRUNCATION);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11728
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11729 /* Overwrite glyphs from IT with truncation glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11730 from = truncate_it.glyph_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11731 end = from + truncate_it.glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11732 to = it->glyph_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11733 toend = to + it->glyph_row->used[TEXT_AREA];
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 while (from < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11736 *to++ = *from++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11737
35301
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
11738 /* There may be padding glyphs left over. Overwrite them too. */
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
11739 while (to < toend && CHAR_GLYPH_PADDING_P (*to))
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
11740 {
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
11741 from = truncate_it.glyph_row->glyphs[TEXT_AREA];
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
11742 while (from < end)
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
11743 *to++ = *from++;
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
11744 }
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
11745
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
11746 if (to > toend)
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
11747 it->glyph_row->used[TEXT_AREA] = to - it->glyph_row->glyphs[TEXT_AREA];
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11748 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11749
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11750
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11751 /* Compute the pixel height and width of IT->glyph_row.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11752
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11753 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
11754 to the max_ascent and max_height values of the display iterator
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11755 structure. This is not the case if
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 1. We hit ZV without displaying anything. In this case, max_ascent
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11758 and max_height will be zero.
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 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
11761 (The glyph row flag contributes_to_line_height_p is for future
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11762 pixmap extensions).
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 The first case is easily covered by using default values because in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11765 these cases, the line height does not really matter, except that it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11766 must not be zero. */
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 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11769 compute_line_metrics (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11770 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11771 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11772 struct glyph_row *row = it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11773 int area, i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11774
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11775 if (FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11776 {
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11777 int i, header_line_height;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11778
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11779 /* The line may consist of one space only, that was added to
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11780 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
11781 computed yet. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11782 if (row->height == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11783 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11784 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
11785 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
11786 row->ascent = it->max_ascent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11787 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
11788 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
11789 row->phys_height = it->max_phys_ascent + it->max_phys_descent;
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11792 /* Compute the width of this line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11793 row->pixel_width = row->x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11794 for (i = 0; i < row->used[TEXT_AREA]; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11795 row->pixel_width += row->glyphs[TEXT_AREA][i].pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11796
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11797 xassert (row->pixel_width >= 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11798 xassert (row->ascent >= 0 && row->height > 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11799
25188
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11800 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
11801 || 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
11802
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11803 /* 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
11804 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
11805 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
11806 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
11807 && row->phys_ascent > row->ascent)
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11808 {
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11809 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
11810 row->ascent = row->phys_ascent;
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11811 }
6849f435f6e8 (compute_line_metrics): If first line's physical ascent
Gerd Moellmann <gerd@gnu.org>
parents: 25098
diff changeset
11812
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11813 /* Compute how much of the line is visible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11814 row->visible_height = row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11815
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11816 header_line_height = WINDOW_DISPLAY_HEADER_LINE_HEIGHT (it->w);
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11817 if (row->y < header_line_height)
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
11818 row->visible_height -= header_line_height - row->y;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11819 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11820 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11821 int max_y = WINDOW_DISPLAY_HEIGHT_NO_MODE_LINE (it->w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11822 if (row->y + row->height > max_y)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11823 row->visible_height -= row->y + row->height - max_y;
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 }
6415
35917d3d0952 (fix_glyph, display_text_line, copy_part_of_rope, display_mode_line): Handle
Karl Heuer <kwzh@gnu.org>
parents: 6372
diff changeset
11826 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11827 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11828 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
11829 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
11830 row->height = row->phys_height = row->visible_height = 1;
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11833 /* Compute a hash code for this row. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11834 row->hash = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11835 for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11836 for (i = 0; i < row->used[area]; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11837 row->hash = ((((row->hash << 4) + (row->hash >> 24)) & 0x0fffffff)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11838 + 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
11839 + 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
11840 + row->glyphs[area][i].padding_p
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11841 + (row->glyphs[area][i].type << 2));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11842
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11843 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
11844 it->max_phys_ascent = it->max_phys_descent = 0;
25012
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11847
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11848 /* 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
11849 window-based redisplay. DEFAULT_FACE_P non-zero means let the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11850 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
11851 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
11852
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
11853 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
11854 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
11855 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
11856 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
11857
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
11858 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
11859 end of the line if the row ends in italic text. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11860
26255
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11861 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11862 append_space (it, default_face_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11863 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11864 int default_face_p;
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 if (FRAME_WINDOW_P (it->f))
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 int n = it->glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11869
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11870 if (it->glyph_row->glyphs[TEXT_AREA] + n
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11871 < it->glyph_row->glyphs[1 + TEXT_AREA])
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11872 {
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11873 /* Save some values that must not be changed.
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11874 Must save IT->c and IT->len because otherwise
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11875 ITERATOR_AT_END_P wouldn't work anymore after
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11876 append_space has been called. */
34987
cf1115a9c758 (make_cursor_line_fully_visible): Remove unused variable
Eli Zaretskii <eliz@gnu.org>
parents: 34947
diff changeset
11877 enum display_element_type saved_what = it->what;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11878 int saved_c = it->c, saved_len = it->len;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11879 int saved_x = it->current_x;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11880 int saved_face_id = it->face_id;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11881 struct text_pos saved_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11882 Lisp_Object saved_object;
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11883 struct face *face;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11884
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11885 saved_object = it->object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11886 saved_pos = it->position;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11887
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11888 it->what = IT_CHARACTER;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11889 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
11890 it->object = make_number (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11891 it->c = ' ';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11892 it->len = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11893
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11894 if (default_face_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11895 it->face_id = DEFAULT_FACE_ID;
34225
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
11896 else if (it->face_before_selective_p)
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
11897 it->face_id = it->saved_face_id;
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11898 face = FACE_FROM_ID (it->f, it->face_id);
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11899 it->face_id = FACE_FOR_CHAR (it->f, face, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11900
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11901 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11902
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11903 it->current_x = saved_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11904 it->object = saved_object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11905 it->position = saved_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11906 it->what = saved_what;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11907 it->face_id = saved_face_id;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11908 it->len = saved_len;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
11909 it->c = saved_c;
26255
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11910 return 1;
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11911 }
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11912 }
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11913
4ebced8747b7 (append_space): Return non-zero if space was appended.
Gerd Moellmann <gerd@gnu.org>
parents: 26203
diff changeset
11914 return 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11915 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11916
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11917
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11918 /* 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
11919 to the end of the display line. Called from display_line.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11920 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
11921 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
11922
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11923 static void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11924 extend_face_to_end_of_line (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11925 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11926 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11927 struct face *face;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11928 struct frame *f = it->f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11929
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11930 /* If line is already filled, do nothing. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11931 if (it->current_x >= it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11932 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11933
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11934 /* Face extension extends the background and box of IT->face_id
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11935 to the end of the line. If the background equals the background
34225
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
11936 of the frame, we don't have to do anything. */
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
11937 if (it->face_before_selective_p)
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
11938 face = FACE_FROM_ID (it->f, it->saved_face_id);
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
11939 else
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
11940 face = FACE_FROM_ID (f, it->face_id);
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
11941
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11942 if (FRAME_WINDOW_P (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11943 && face->box == FACE_NO_BOX
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11944 && face->background == FRAME_BACKGROUND_PIXEL (f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11945 && !face->stipple)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11946 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11947
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11948 /* 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
11949 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
11950 it->glyph_row->fill_line_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11951
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11952 /* 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
11953 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
11954 get_next_display_element returns a multibyte character. Note
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11955 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
11956 if (!SINGLE_BYTE_CHAR_P (it->c))
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11957 {
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
11958 it->face_id = FACE_FOR_CHAR (f, face, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11959 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11960
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11961 if (FRAME_WINDOW_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11962 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11963 /* 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
11964 so that we know which face to draw. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11965 if (it->glyph_row->used[TEXT_AREA] == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11966 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11967 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
11968 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
11969 it->glyph_row->used[TEXT_AREA] = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11970 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11971 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11972 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11973 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11974 /* Save some values that must not be changed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11975 int saved_x = it->current_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11976 struct text_pos saved_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11977 Lisp_Object saved_object;
34987
cf1115a9c758 (make_cursor_line_fully_visible): Remove unused variable
Eli Zaretskii <eliz@gnu.org>
parents: 34947
diff changeset
11978 enum display_element_type saved_what = it->what;
34225
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
11979 int saved_face_id = it->face_id;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11980
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11981 saved_object = it->object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11982 saved_pos = it->position;
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 it->what = IT_CHARACTER;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11985 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
11986 it->object = make_number (0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11987 it->c = ' ';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11988 it->len = 1;
34225
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
11989 it->face_id = face->id;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11990
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11991 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11992
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11993 while (it->current_x <= it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11994 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11995
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11996 /* 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
11997 truncation glyph below and make us set the cursor on them, maybe. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11998 it->current_x = saved_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
11999 it->object = saved_object;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12000 it->position = saved_pos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12001 it->what = saved_what;
34225
b5cdf1bb6bb8 (next_element_from_ellipsis): Save face before selective
Gerd Moellmann <gerd@gnu.org>
parents: 34068
diff changeset
12002 it->face_id = saved_face_id;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12003 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12006
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12007 /* 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
12008 trailing whitespace. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12009
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
12010 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12011 trailing_whitespace_p (charpos)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12012 int charpos;
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 int bytepos = CHAR_TO_BYTE (charpos);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12015 int c = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12016
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12017 while (bytepos < ZV_BYTE
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12018 && (c = FETCH_CHAR (bytepos),
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12019 c == ' ' || c == '\t'))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12020 ++bytepos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12021
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
12022 if (bytepos >= ZV_BYTE || c == '\n' || c == '\r')
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
12023 {
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
12024 if (bytepos != PT_BYTE)
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
12025 return 1;
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
12026 }
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
12027 return 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12028 }
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12031 /* Highlight trailing whitespace, if any, in ROW. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12032
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12033 void
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12034 highlight_trailing_whitespace (f, row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12035 struct frame *f;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12036 struct glyph_row *row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12037 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12038 int used = row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12039
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12040 if (used)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12041 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12042 struct glyph *start = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12043 struct glyph *glyph = start + used - 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12044
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12045 /* Skip over the space glyph inserted to display the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12046 cursor at the end of a line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12047 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
12048 && 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
12049 && INTEGERP (glyph->object))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12050 --glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12051
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12052 /* If last glyph is a space or stretch, and it's trailing
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12053 whitespace, set the face of all trailing whitespace glyphs in
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12054 IT->glyph_row to `trailing-whitespace'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12055 if (glyph >= start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12056 && BUFFERP (glyph->object)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12057 && (glyph->type == STRETCH_GLYPH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12058 || (glyph->type == CHAR_GLYPH
27000
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
12059 && glyph->u.ch == ' '))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12060 && trailing_whitespace_p (glyph->charpos))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12061 {
28228
84be12f331b8 (charset_at_position): Function removed.
Kenichi Handa <handa@m17n.org>
parents: 28206
diff changeset
12062 int face_id = lookup_named_face (f, Qtrailing_whitespace, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12063
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12064 while (glyph >= start
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12065 && BUFFERP (glyph->object)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12066 && (glyph->type == STRETCH_GLYPH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12067 || (glyph->type == CHAR_GLYPH
27000
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
12068 && glyph->u.ch == ' ')))
d7f15cd9c4ad All codes adjusted for the change of struct glyph.
Kenichi Handa <handa@m17n.org>
parents: 26908
diff changeset
12069 (glyph--)->face_id = face_id;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12070 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12071 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12072 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12073
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12074
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12075 /* 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
12076 used to hold the cursor. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12077
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12078 static int
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12079 cursor_row_p (w, row)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12080 struct window *w;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12081 struct glyph_row *row;
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12082 {
32590
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
12083 int cursor_row_p = 1;
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
12084
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12085 if (PT == MATRIX_ROW_END_CHARPOS (row))
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12086 {
32590
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
12087 /* 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
12088 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
12089 newline). */
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
12090 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
12091 || 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
12092 cursor_row_p = row->continued_p;
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
12093
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
12094 /* 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
12095 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
12096 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
12097 cursor_row_p = 1;
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
12098 else
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
12099 cursor_row_p = 0;
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
12100 }
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
12101
04def897a1c6 (cursor_row_p): Take continued lines into account.
Gerd Moellmann <gerd@gnu.org>
parents: 32585
diff changeset
12102 return cursor_row_p;
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12103 }
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12104
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12105
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12106 /* Construct the glyph row IT->glyph_row in the desired matrix of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12107 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
12108 for an overview of struct it. Value is non-zero if
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12109 IT->glyph_row displays text, as opposed to a line displaying ZV
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12110 only. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12111
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12112 static int
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12113 display_line (it)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12114 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12115 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12116 struct glyph_row *row = it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12117
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12118 /* We always start displaying at hpos zero even if hscrolled. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12119 xassert (it->hpos == 0 && it->current_x == 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12120
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12121 /* 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
12122 xassert (MATRIX_ROW_VPOS (row, it->w->desired_matrix)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12123 < it->w->desired_matrix->nrows);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12124
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12125 /* Is IT->w showing the region? */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12126 it->w->region_showing = it->region_beg_charpos > 0 ? Qt : Qnil;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12127
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12128 /* Clear the result glyph row and enable it. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12129 prepare_desired_row (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12130
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12131 row->y = it->current_y;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12132 row->start = it->current;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12133 row->continuation_lines_width = it->continuation_lines_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12134 row->displays_text_p = 1;
29473
80835e075d87 (display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents: 29461
diff changeset
12135 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
12136 it->starts_in_middle_of_char_p = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12137
2766
aa7b6f6aa20a * xdisp.c (copy_rope, copy_part_of_rope): Add face argument.
Jim Blandy <jimb@redhat.com>
parents: 2754
diff changeset
12138 /* Arrange the overlays nicely for our purposes. Usually, we call
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12139 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
12140 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
12141 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
12142 recenter_overlay_lists but the first will be pretty cheap. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12143 recenter_overlay_lists (current_buffer, IT_CHARPOS (*it));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12144
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12145 /* Move over display elements that are not visible because we are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12146 hscrolled. This may stop at an x-position < IT->first_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12147 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
12148 if (it->current_x < it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12149 move_it_in_display_line_to (it, ZV, it->first_visible_x,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12150 MOVE_TO_POS | MOVE_TO_X);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12151
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12152 /* Get the initial row height. This is either the height of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12153 text hscrolled, if there is any, or zero. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12154 row->ascent = it->max_ascent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12155 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
12156 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
12157 row->phys_height = it->max_phys_ascent + it->max_phys_descent;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12158
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12159 /* Loop generating characters. The loop is left with IT on the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12160 character to display. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12161 while (1)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12162 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12163 int n_glyphs_before, hpos_before, x_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12164 int x, i, nglyphs;
31506
a1d733428491 (dump_glyph_row): Fix printf format string.
Gerd Moellmann <gerd@gnu.org>
parents: 31493
diff changeset
12165 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
12166
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12167 /* Retrieve the next thing to display. Value is zero if end of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12168 buffer reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12169 if (!get_next_display_element (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12170 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12171 /* 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
12172 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
12173 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
12174 to -1. */
12ddeb9a6efd (display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents: 26258
diff changeset
12175 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
12176 || row->used[TEXT_AREA] == 0)
12ddeb9a6efd (display_line): Set charpos of first glyph in blank
Gerd Moellmann <gerd@gnu.org>
parents: 26258
diff changeset
12177 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12178 row->glyphs[TEXT_AREA]->charpos = -1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12179 row->displays_text_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12180
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12181 if (!NILP (XBUFFER (it->w->buffer)->indicate_empty_lines))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12182 row->indicate_empty_line_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12183 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12184
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12185 it->continuation_lines_width = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12186 row->ends_at_zv_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12187 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12188 }
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 /* Now, get the metrics of what we want to display. This also
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12191 generates glyphs in `row' (which is IT->glyph_row). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12192 n_glyphs_before = row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12193 x = it->current_x;
28723
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12194
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12195 /* 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
12196 fit on the line. */
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12197 if (!it->truncate_lines_p)
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12198 {
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12199 ascent = it->max_ascent;
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12200 descent = it->max_descent;
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12201 phys_ascent = it->max_phys_ascent;
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12202 phys_descent = it->max_phys_descent;
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12203 }
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12204
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12205 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12206
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12207 /* If this display element was in marginal areas, continue with
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12208 the next one. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12209 if (it->area != TEXT_AREA)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12210 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12211 row->ascent = max (row->ascent, it->max_ascent);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12212 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
12213 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
12214 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
12215 it->max_phys_ascent + it->max_phys_descent);
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12216 set_iterator_to_next (it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12217 continue;
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
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12220 /* Does the display element fit on the line? If we truncate
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12221 lines, we should draw past the right edge of the window. If
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12222 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
12223 continuation glyph before the right margin. If lines are
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12224 continued, there are two possible strategies for characters
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12225 resulting in more than 1 glyph (e.g. tabs): Display as many
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12226 glyphs as possible in this line and leave the rest for the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12227 continuation line, or display the whole element in the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12228 line. Original redisplay did the former, so we do it also. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12229 nglyphs = row->used[TEXT_AREA] - n_glyphs_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12230 hpos_before = it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12231 x_before = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12232
35596
37e5851b22b2 (display_line): Simplify check for glyphs fitting
Gerd Moellmann <gerd@gnu.org>
parents: 35550
diff changeset
12233 if (it->current_x < it->last_visible_x)
37e5851b22b2 (display_line): Simplify check for glyphs fitting
Gerd Moellmann <gerd@gnu.org>
parents: 35550
diff changeset
12234 {
37e5851b22b2 (display_line): Simplify check for glyphs fitting
Gerd Moellmann <gerd@gnu.org>
parents: 35550
diff changeset
12235 /* Glyphs produced fit entirely in the line. */
35301
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
12236 it->hpos += nglyphs;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12237 row->ascent = max (row->ascent, it->max_ascent);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12238 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
12239 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
12240 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
12241 it->max_phys_ascent + it->max_phys_descent);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12242 if (it->current_x - it->pixel_width < it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12243 row->x = x - it->first_visible_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12244 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12245 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12246 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12247 int new_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12248 struct glyph *glyph;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12249
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12250 for (i = 0; i < nglyphs; ++i, x = new_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12251 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12252 glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12253 new_x = x + glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12254
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12255 if (/* Lines are continued. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12256 !it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12257 && (/* Glyph doesn't fit on the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12258 new_x > it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12259 /* Or it fits exactly on a window system frame. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12260 || (new_x == it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12261 && FRAME_WINDOW_P (it->f))))
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
12262 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12263 /* End of a continued line. */
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 if (it->hpos == 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12266 || (new_x == it->last_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12267 && FRAME_WINDOW_P (it->f)))
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
12268 {
28723
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12269 /* 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
12270 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
12271 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
12272 after the glyph. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12273 row->continued_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12274 it->current_x = new_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12275 it->continuation_lines_width += new_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12276 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12277 if (i == nglyphs - 1)
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12278 set_iterator_to_next (it, 1);
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
12279 }
29461
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12280 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
12281 && !FRAME_WINDOW_P (it->f))
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12282 {
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12283 /* 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
12284 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
12285 on the line. */
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12286 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
12287
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12288 /* 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
12289 glyphs like in 20.x. */
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12290 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
12291 < row->glyphs[1 + TEXT_AREA])
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12292 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
12293
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12294 row->continued_p = 1;
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12295 it->current_x = x_before;
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12296 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
12297
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12298 /* 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
12299 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
12300 it->max_ascent = ascent;
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12301 it->max_descent = descent;
159e43bc7e3c (display_line): Revert change of 2000-06-06. Treat
Gerd Moellmann <gerd@gnu.org>
parents: 29449
diff changeset
12302 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
12303 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
12304 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12305 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12306 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12307 /* Display element draws past the right edge of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12308 the window. Restore positions to values
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12309 before the element. The next line starts
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12310 with current_x before the glyph that could
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12311 not be displayed, so that TAB works right. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12312 row->used[TEXT_AREA] = n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12313
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12314 /* Display continuation glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12315 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12316 produce_special_glyphs (it, IT_CONTINUATION);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12317 row->continued_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12318
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12319 it->current_x = x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12320 it->continuation_lines_width += x;
29473
80835e075d87 (display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents: 29461
diff changeset
12321 if (nglyphs > 1 && i > 0)
80835e075d87 (display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents: 29461
diff changeset
12322 {
80835e075d87 (display_line): Set row's and iterator's
Gerd Moellmann <gerd@gnu.org>
parents: 29461
diff changeset
12323 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
12324 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
12325 }
28723
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12326
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12327 /* 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
12328 element not fitting on the line. */
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12329 it->max_ascent = ascent;
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12330 it->max_descent = descent;
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12331 it->max_phys_ascent = phys_ascent;
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12332 it->max_phys_descent = phys_descent;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12333 }
28723
67ffd6aa22da (display_line): If lines are continued, restore
Gerd Moellmann <gerd@gnu.org>
parents: 28709
diff changeset
12334
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12335 break;
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
12336 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12337 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
12338 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12339 /* Increment number of glyphs actually displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12340 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12341
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12342 if (x < it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12343 /* Glyph is partially visible, i.e. row starts at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12344 negative X position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12345 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
12346 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12347 else
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
12348 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12349 /* Glyph is completely off the left margin of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12350 window. This should not happen because of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12351 move_it_in_display_line at the start of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12352 this function. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12353 abort ();
11854
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
12354 }
637c5283e74b (zv_strings_seen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 11810
diff changeset
12355 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12356
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12357 row->ascent = max (row->ascent, it->max_ascent);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12358 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
12359 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
12360 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
12361 it->max_phys_ascent + it->max_phys_descent);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12362
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12363 /* End of this display line if row is continued. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12364 if (row->continued_p)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12365 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12366 }
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 /* 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
12369 sure that a non-default face is extended up to the right
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12370 margin of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12371 if (ITERATOR_AT_END_OF_LINE_P (it))
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 int used_before = row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12374
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12375 /* 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
12376 display the cursor there. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12377 append_space (it, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12378
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12379 /* Extend the face to the end of the line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12380 extend_face_to_end_of_line (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12381
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12382 /* Make sure we have the position. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12383 if (used_before == 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12384 row->glyphs[TEXT_AREA]->charpos = CHARPOS (it->position);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12385
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12386 /* 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
12387 set_iterator_to_next (it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12388 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
12389 break;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12390 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12391
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12392 /* Proceed with next display element. Note that this skips
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12393 over lines invisible because of selective display. */
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12394 set_iterator_to_next (it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12395
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12396 /* If we truncate lines, we are done when the last displayed
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12397 glyphs reach past the right margin of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12398 if (it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12399 && (FRAME_WINDOW_P (it->f)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12400 ? (it->current_x >= it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12401 : (it->current_x > it->last_visible_x)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12402 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12403 /* Maybe add truncation glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12404 if (!FRAME_WINDOW_P (it->f))
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
12405 {
35200
13258951565d (display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents: 35174
diff changeset
12406 int i, n;
13258951565d (display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents: 35174
diff changeset
12407
13258951565d (display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents: 35174
diff changeset
12408 for (i = row->used[TEXT_AREA] - 1; i > 0; --i)
13258951565d (display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents: 35174
diff changeset
12409 if (!CHAR_GLYPH_PADDING_P (row->glyphs[TEXT_AREA][i]))
13258951565d (display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents: 35174
diff changeset
12410 break;
13258951565d (display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents: 35174
diff changeset
12411
13258951565d (display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents: 35174
diff changeset
12412 for (n = row->used[TEXT_AREA]; i < n; ++i)
13258951565d (display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents: 35174
diff changeset
12413 {
13258951565d (display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents: 35174
diff changeset
12414 row->used[TEXT_AREA] = i;
13258951565d (display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents: 35174
diff changeset
12415 produce_special_glyphs (it, IT_TRUNCATION);
13258951565d (display_line): On ttys, produce more than one
Gerd Moellmann <gerd@gnu.org>
parents: 35174
diff changeset
12416 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12417 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12418
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12419 row->truncated_on_right_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12420 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
12421 reseat_at_next_visible_line_start (it, 0);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12422 row->ends_at_zv_p = FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12423 it->hpos = hpos_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12424 it->current_x = x_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12425 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12426 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12427 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12428
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12429 /* If line is not empty and hscrolled, maybe insert truncation glyphs
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12430 at the left window margin. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12431 if (it->first_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12432 && IT_CHARPOS (*it) != MATRIX_ROW_START_CHARPOS (row))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12433 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12434 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12435 insert_left_trunc_glyphs (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12436 row->truncated_on_left_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12437 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12438
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12439 /* If the start of this line is the overlay arrow-position, then
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12440 mark this glyph row as the one containing the overlay arrow.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12441 This is clearly a mess with variable size fonts. It would be
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12442 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
12443 if (MARKERP (Voverlay_arrow_position)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12444 && current_buffer == XMARKER (Voverlay_arrow_position)->buffer
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12445 && (MATRIX_ROW_START_CHARPOS (row)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12446 == 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
12447 && STRINGP (Voverlay_arrow_string)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12448 && ! overlay_arrow_seen)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12449 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12450 /* Overlay arrow in window redisplay is a bitmap. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12451 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12452 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12453 struct glyph_row *arrow_row = get_overlay_arrow_glyph_row (it->w);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12454 struct glyph *glyph = arrow_row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12455 struct glyph *arrow_end = glyph + arrow_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12456 struct glyph *p = row->glyphs[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12457 struct glyph *p2, *end;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12458
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12459 /* Copy the arrow glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12460 while (glyph < arrow_end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12461 *p++ = *glyph++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12462
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12463 /* Throw away padding glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12464 p2 = p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12465 end = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12466 while (p2 < end && CHAR_GLYPH_PADDING_P (*p2))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12467 ++p2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12468 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
12469 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12470 while (p2 < end)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12471 *p++ = *p2++;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12472 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
12473 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12474 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12475
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12476 overlay_arrow_seen = 1;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12477 row->overlay_arrow_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12478 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12479
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12480 /* Compute pixel dimensions of this line. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12481 compute_line_metrics (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12482
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12483 /* Remember the position at which this line ends. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12484 row->end = it->current;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12485
29481
b36d76033c9d (display_line): Fix code deciding in which line to
Gerd Moellmann <gerd@gnu.org>
parents: 29473
diff changeset
12486 /* Maybe set the cursor. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12487 if (it->w->cursor.vpos < 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12488 && PT >= MATRIX_ROW_START_CHARPOS (row)
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12489 && PT <= MATRIX_ROW_END_CHARPOS (row)
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12490 && cursor_row_p (it->w, row))
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
12491 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
12492
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12493 /* Highlight trailing whitespace. */
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
12494 if (!NILP (Vshow_trailing_whitespace))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12495 highlight_trailing_whitespace (it->f, it->glyph_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12496
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12497 /* Prepare for the next line. This line starts horizontally at (X
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12498 HPOS) = (0 0). Vertical positions are incremented. As a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12499 convenience for the caller, IT->glyph_row is set to the next
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12500 row to be used. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12501 it->current_x = it->hpos = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12502 it->current_y += row->height;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12503 ++it->vpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12504 ++it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12505 return row->displays_text_p;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12506 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12507
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12508
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12509
25012
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 Menu Bar
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12512 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12513
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12514 /* Redisplay the menu bar in the frame for window W.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12515
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12516 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
12517 displayed in a special window W->frame->menu_bar_window.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12518
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12519 The menu bar of terminal frames is treated specially as far as
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12520 glyph matrices are concerned. Menu bar lines are not part of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12521 windows, so the update is done directly on the frame matrix rows
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12522 for the menu bar. */
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
12523
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
12524 static void
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
12525 display_menu_bar (w)
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
12526 struct window *w;
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
12527 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12528 struct frame *f = XFRAME (WINDOW_FRAME (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12529 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12530 Lisp_Object items;
6134
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
12531 int i;
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
12532
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12533 /* 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
12534 #ifdef HAVE_NTGUI
15245
4bfe3c580496 (display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents: 15111
diff changeset
12535 if (!NILP (Vwindow_system))
4bfe3c580496 (display_menu_bar) [HAVE_NTGUI]: Enable the display of
Karl Heuer <kwzh@gnu.org>
parents: 15111
diff changeset
12536 return;
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
12537 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12538 #ifdef USE_X_TOOLKIT
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12539 if (FRAME_X_P (f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12540 return;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12541 #endif
32752
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
12542 #ifdef macintosh
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
12543 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
12544 return;
923b8d6d8277 Initial check-in: changes for building Emacs under Mac OS.
Andrew Choi <akochoi@shaw.ca>
parents: 32592
diff changeset
12545 #endif
13511
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
12546
a0fd601c9d5b (display_menu_bar): Fix backwards conditional.
Richard M. Stallman <rms@gnu.org>
parents: 13459
diff changeset
12547 #ifdef USE_X_TOOLKIT
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12548 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
12549 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
12550 it.first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12551 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12552 #else /* not USE_X_TOOLKIT */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12553 if (FRAME_WINDOW_P (f))
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 /* Menu bar lines are displayed in the desired matrix of the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12556 dummy window menu_bar_window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12557 struct window *menu_w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12558 xassert (WINDOWP (f->menu_bar_window));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12559 menu_w = XWINDOW (f->menu_bar_window);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12560 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
12561 MENU_FACE_ID);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12562 it.first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12563 it.last_visible_x = FRAME_WINDOW_WIDTH (f) * CANON_X_UNIT (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12564 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12565 else
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 /* 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
12568 pixel x/y. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12569 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
12570 MENU_FACE_ID);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12571 it.first_visible_x = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12572 it.last_visible_x = FRAME_WIDTH (f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12573 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12574 #endif /* not USE_X_TOOLKIT */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12575
33840
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
12576 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
12577 /* 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
12578 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
12579
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12580 /* Clear all rows of the menu bar. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12581 for (i = 0; i < FRAME_MENU_BAR_LINES (f); ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12582 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12583 struct glyph_row *row = it.glyph_row + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12584 clear_glyph_row (row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12585 row->enabled_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12586 row->full_width_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12587 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12588
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12589 /* Display all items of the menu bar. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12590 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
12591 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
12592 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12593 Lisp_Object string;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12594
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12595 /* 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
12596 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
12597 if (NILP (string))
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
12598 break;
c656768172d2 (update_menu_bar): Change call to menu_bar_items.
Richard M. Stallman <rms@gnu.org>
parents: 6091
diff changeset
12599
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12600 /* Remember where item was displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12601 XSETFASTINT (XVECTOR (items)->contents[i + 3], it.hpos);
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 /* Display the item, pad with one space. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12604 if (it.current_x < it.last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12605 display_string (NULL, string, Qnil, 0, 0, &it,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12606 XSTRING (string)->size + 1, 0, 0, -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12607 }
2189
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
12608
cb92d253a599 (display_menu_bar): Assume FRAME_MENU_BAR_ITEMS already set.
Richard M. Stallman <rms@gnu.org>
parents: 2150
diff changeset
12609 /* Fill out the line with spaces. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12610 if (it.current_x < it.last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12611 display_string ("", Qnil, Qnil, 0, 0, &it, -1, 0, 0, -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12612
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12613 /* Compute the total height of the lines. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12614 compute_line_metrics (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12615 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12616
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12617
2150
cb8205e30dda (display_menu_bar): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2065
diff changeset
12618
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12619 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12620 Mode Line
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12621 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12622
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12623 /* 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
12624 FORCE is non-zero, redisplay mode lines unconditionally.
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12625 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
12626 the number of windows whose mode lines were redisplayed. */
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12627
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12628 static int
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12629 redisplay_mode_lines (window, force)
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12630 Lisp_Object window;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12631 int force;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12632 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12633 int nwindows = 0;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12634
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12635 while (!NILP (window))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12636 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12637 struct window *w = XWINDOW (window);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12638
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12639 if (WINDOWP (w->hchild))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12640 nwindows += redisplay_mode_lines (w->hchild, force);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12641 else if (WINDOWP (w->vchild))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12642 nwindows += redisplay_mode_lines (w->vchild, force);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12643 else if (force
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12644 || FRAME_GARBAGED_P (XFRAME (w->frame))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12645 || !MATRIX_MODE_LINE_ROW (w->current_matrix)->enabled_p)
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12646 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12647 Lisp_Object old_selected_frame;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12648 struct text_pos lpoint;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12649 struct buffer *old = current_buffer;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12650
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12651 /* 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
12652 SET_TEXT_POS (lpoint, PT, PT_BYTE);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12653 set_buffer_internal_1 (XBUFFER (w->buffer));
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12654
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12655 /* Point refers normally to the selected window. For any
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12656 other window, set up appropriate value. */
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12657 if (!EQ (window, selected_window))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12658 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12659 struct text_pos pt;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12660
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12661 SET_TEXT_POS_FROM_MARKER (pt, w->pointm);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12662 if (CHARPOS (pt) < BEGV)
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12663 TEMP_SET_PT_BOTH (BEGV, BEGV_BYTE);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12664 else if (CHARPOS (pt) > (ZV - 1))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12665 TEMP_SET_PT_BOTH (ZV, ZV_BYTE);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12666 else
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12667 TEMP_SET_PT_BOTH (CHARPOS (pt), BYTEPOS (pt));
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12668 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12669
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12670 /* Temporarily set up the selected frame. */
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12671 old_selected_frame = selected_frame;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12672 selected_frame = w->frame;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12673
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12674 /* Display mode lines. */
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12675 clear_glyph_matrix (w->desired_matrix);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12676 if (display_mode_lines (w))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12677 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12678 ++nwindows;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12679 w->must_be_updated_p = 1;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12680 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12681
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12682 /* Restore old settings. */
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12683 selected_frame = old_selected_frame;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12684 set_buffer_internal_1 (old);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12685 TEMP_SET_PT_BOTH (CHARPOS (lpoint), BYTEPOS (lpoint));
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12686 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12687
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12688 window = w->next;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12689 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12690
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12691 return nwindows;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12692 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12693
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12694
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12695 /* 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
12696 of mode lines displayed. */
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12697
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12698 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12699 display_mode_lines (w)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12700 struct window *w;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12701 {
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12702 int n = 0;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12703
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12704 /* 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
12705 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
12706 w->column_number_displayed = Qnil;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
12707
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12708 if (WINDOW_WANTS_MODELINE_P (w))
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12709 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12710 display_mode_line (w, MODE_LINE_FACE_ID,
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12711 current_buffer->mode_line_format);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12712 ++n;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12713 }
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
12714
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
12715 if (WINDOW_WANTS_HEADER_LINE_P (w))
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12716 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12717 display_mode_line (w, HEADER_LINE_FACE_ID,
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12718 current_buffer->header_line_format);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12719 ++n;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12720 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12721
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
12722 return n;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12723 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12724
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12725
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12726 /* Display mode or top line of window W. FACE_ID specifies which line
25546
Gerd Moellmann <gerd@gnu.org>
parents: 25543
diff changeset
12727 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
12728 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
12729 height of the mode line displayed. */
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
12730
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
12731 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12732 display_mode_line (w, face_id, format)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12733 struct window *w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12734 enum face_id face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12735 Lisp_Object format;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12736 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12737 struct it it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12738 struct face *face;
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 init_iterator (&it, w, -1, -1, NULL, face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12741 prepare_desired_row (it.glyph_row);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12742
33840
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
12743 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
12744 /* 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
12745 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
12746
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12747 /* Temporarily make frame's keyboard the current kboard so that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12748 kboard-local variables in the mode_line_format will get the right
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12749 values. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12750 push_frame_kboard (it.f);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12751 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
12752 pop_frame_kboard ();
17f7be3e2443 (display_mode_line): Use push_frame_kboard, pop_frame_kboard.
Richard M. Stallman <rms@gnu.org>
parents: 11291
diff changeset
12753
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12754 /* Fill up with spaces. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12755 display_string (" ", Qnil, Qnil, 0, 0, &it, 10000, -1, -1, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12756
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12757 compute_line_metrics (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12758 it.glyph_row->full_width_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12759 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
12760 it.glyph_row->inverse_p = 0;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12761 it.glyph_row->continued_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12762 it.glyph_row->truncated_on_left_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12763 it.glyph_row->truncated_on_right_p = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12764
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12765 /* Make a 3D mode-line have a shadow at its right end. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12766 face = FACE_FROM_ID (it.f, face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12767 extend_face_to_end_of_line (&it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12768 if (face->box != FACE_NO_BOX)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12769 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12770 struct glyph *last = (it.glyph_row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12771 + it.glyph_row->used[TEXT_AREA] - 1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12772 last->right_box_line_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12773 }
33462
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
12774
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
12775 return it.glyph_row->height;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12776 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12777
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12778
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12779 /* Contribute ELT to the mode line for window IT->w. How it
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12780 translates into text depends on its data type.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12781
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12782 IT describes the display environment in which we display, as usual.
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12783
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12784 DEPTH is the depth in recursion. It is used to prevent
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12785 infinite recursion here.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12786
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12787 FIELD_WIDTH is the number of characters the display of ELT should
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12788 occupy in the mode line, and PRECISION is the maximum number of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12789 characters to display from ELT's representation. See
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12790 display_string for details. *
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12791
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12792 Returns the hpos of the end of the text generated by ELT. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12793
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12794 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12795 display_mode_element (it, depth, field_width, precision, elt)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12796 struct it *it;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12797 int depth;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12798 int field_width, precision;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12799 Lisp_Object elt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12800 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12801 int n = 0, field, prec;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12802
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12803 tail_recurse:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12804 if (depth > 10)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12805 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12806
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12807 depth++;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12808
10457
2ab3bd0288a9 Change all occurences of SWITCH_ENUM_BUG to use SWITCH_ENUM_CAST instead.
Karl Heuer <kwzh@gnu.org>
parents: 10442
diff changeset
12809 switch (SWITCH_ENUM_CAST (XTYPE (elt)))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12810 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12811 case Lisp_String:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12812 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12813 /* A string: output it and check for %-constructs within it. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12814 unsigned char c;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12815 unsigned char *this = XSTRING (elt)->data;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12816 unsigned char *lisp_string = this;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12817
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12818 while ((precision <= 0 || n < precision)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12819 && *this
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12820 && (frame_title_ptr
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12821 || it->current_x < it->last_visible_x))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12822 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12823 unsigned char *last = this;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12824
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12825 /* Advance to end of string or next format specifier. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12826 while ((c = *this++) != '\0' && c != '%')
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12827 ;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12828
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12829 if (this - 1 != last)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12830 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12831 /* Output to end of string or up to '%'. Field width
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12832 is length of string. Don't output more than
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12833 PRECISION allows us. */
35410
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
12834 --this;
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
12835 prec = strwidth (last, this - last);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12836 if (precision > 0 && prec > precision - n)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12837 prec = precision - n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12838
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12839 if (frame_title_ptr)
35410
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
12840 n += store_frame_title (last, 0, prec);
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12841 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12842 n += display_string (NULL, elt, Qnil, 0, last - lisp_string,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12843 it, 0, prec, 0, -1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12844 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12845 else /* c == '%' */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12846 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12847 unsigned char *percent_position = this;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12848
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12849 /* Get the specified minimum width. Zero means
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12850 don't pad. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12851 field = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12852 while ((c = *this++) >= '0' && c <= '9')
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12853 field = field * 10 + c - '0';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12854
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12855 /* Don't pad beyond the total padding allowed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12856 if (field_width - n > 0 && field > field_width - n)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12857 field = field_width - n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12858
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12859 /* Note that either PRECISION <= 0 or N < PRECISION. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12860 prec = precision - n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12861
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12862 if (c == 'M')
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12863 n += display_mode_element (it, depth, field, prec,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12864 Vglobal_mode_string);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12865 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
12866 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12867 unsigned char *spec
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12868 = decode_mode_spec (it->w, c, field, prec);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12869
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12870 if (frame_title_ptr)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12871 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
12872 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12873 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12874 int nglyphs_before
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12875 = it->glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12876 int charpos
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12877 = percent_position - XSTRING (elt)->data;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12878 int nwritten
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12879 = display_string (spec, Qnil, elt, charpos, 0, it,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12880 field, prec, 0, -1);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12881
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12882 /* Assign to the glyphs written above the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12883 string where the `%x' came from, position
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12884 of the `%'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12885 if (nwritten > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12886 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12887 struct glyph *glyph
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12888 = (it->glyph_row->glyphs[TEXT_AREA]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12889 + nglyphs_before);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12890 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12891
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12892 for (i = 0; i < nwritten; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12893 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12894 glyph[i].object = elt;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12895 glyph[i].charpos = charpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12896 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12897
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12898 n += nwritten;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12899 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12900 }
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12901 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12902 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12903 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12904 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12905 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12906
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12907 case Lisp_Symbol:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12908 /* A symbol: process the value of the symbol recursively
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12909 as if it appeared here directly. Avoid error if symbol void.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12910 Special case: if value of symbol is a string, output the string
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12911 literally. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12912 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12913 register Lisp_Object tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12914 tem = Fboundp (elt);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
12915 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12916 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12917 tem = Fsymbol_value (elt);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12918 /* If value is a string, output that string literally:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12919 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
12920 if (STRINGP (tem))
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12921 {
35410
94d2751dcb5c (store_frame_title): Pay attention to width of non-ASCII
Kenichi Handa <handa@m17n.org>
parents: 35389
diff changeset
12922 prec = precision - n;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
12923 if (frame_title_ptr)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12924 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
12925 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12926 n += display_string (NULL, tem, Qnil, 0, 0, it,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12927 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
12928 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12929 else if (!EQ (tem, elt))
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12930 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12931 /* Give up right away for nil or t. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12932 elt = tem;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12933 goto tail_recurse;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12934 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12935 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12936 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12937 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12938
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12939 case Lisp_Cons:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12940 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12941 register Lisp_Object car, tem;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12942
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12943 /* A cons cell: three distinct cases.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12944 If first element is a string or a cons, process all the elements
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12945 and effectively concatenate them.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12946 If first element is a negative number, truncate displaying cdr to
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12947 at most that many characters. If positive, pad (with spaces)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12948 to at least that many characters.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12949 If first element is a symbol, process the cadr or caddr recursively
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12950 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
12951 car = XCAR (elt);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12952 if (EQ (car, QCeval) && CONSP (XCDR (elt)))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12953 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12954 /* An element of the form (:eval FORM) means evaluate FORM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12955 and use the result as mode line elements. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12956 struct gcpro gcpro1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12957 Lisp_Object spec;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12958
32175
e5d99e8cbd94 (handle_single_display_prop): Use safe_call1.
Gerd Moellmann <gerd@gnu.org>
parents: 31931
diff changeset
12959 spec = safe_eval (XCAR (XCDR (elt)));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12960 GCPRO1 (spec);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12961 n += display_mode_element (it, depth, field_width - n,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12962 precision - n, spec);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12963 UNGCPRO;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12964 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12965 else if (SYMBOLP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12966 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12967 tem = Fboundp (car);
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12968 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
12969 if (!CONSP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12970 goto invalid;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12971 /* elt is now the cdr, and we know it is a cons cell.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12972 Use its car if CAR has a non-nil value. */
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
12973 if (!NILP (tem))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12974 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12975 tem = Fsymbol_value (car);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
12976 if (!NILP (tem))
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12977 {
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12978 elt = XCAR (elt);
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12979 goto tail_recurse;
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12980 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12981 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12982 /* Symbol's value is nil (or symbol is unbound)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12983 Get the cddr of the original list
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12984 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
12985 elt = XCDR (elt);
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 433
diff changeset
12986 if (NILP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12987 break;
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
12988 else if (!CONSP (elt))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12989 goto invalid;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12990 elt = XCAR (elt);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12991 goto tail_recurse;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12992 }
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
12993 else if (INTEGERP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12994 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12995 register int lim = XINT (car);
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
12996 elt = XCDR (elt);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12997 if (lim < 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12998 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
12999 /* Negative int means reduce maximum width. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13000 if (precision <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13001 precision = -lim;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13002 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13003 precision = min (precision, -lim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13004 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13005 else if (lim > 0)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13006 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13007 /* Padding specified. Don't let it be more than
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13008 current maximum. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13009 if (precision > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13010 lim = min (precision, lim);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13011
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13012 /* If that's more padding than already wanted, queue it.
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13013 But don't reduce padding already specified even if
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13014 that is beyond the current truncation point. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13015 field_width = max (lim, field_width);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13016 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13017 goto tail_recurse;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13018 }
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
13019 else if (STRINGP (car) || CONSP (car))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13020 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13021 register int limit = 50;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13022 /* Limit is to protect against circular lists. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13023 while (CONSP (elt)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13024 && --limit > 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13025 && (precision <= 0 || n < precision))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13026 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13027 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
13028 precision - n, XCAR (elt));
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13029 elt = XCDR (elt);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13030 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13031 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13032 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13033 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13034
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13035 default:
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13036 invalid:
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13037 if (frame_title_ptr)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13038 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
13039 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13040 n += display_string ("*invalid*", Qnil, Qnil, 0, 0, it, 0,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13041 precision - n, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13042 return n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13043 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13044
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13045 /* Pad to FIELD_WIDTH. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13046 if (field_width > 0 && n < field_width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13047 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13048 if (frame_title_ptr)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13049 n += store_frame_title ("", field_width - n, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13050 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13051 n += display_string ("", Qnil, Qnil, 0, 0, it, field_width - n,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13052 0, 0, 0);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13053 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13054
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13055 return n;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13056 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13057
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13058
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13059 /* 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
13060 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
13061
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13062 static void
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13063 pint2str (buf, width, d)
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13064 register char *buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13065 register int width;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13066 register int d;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13067 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13068 register char *p = buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13069
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13070 if (d <= 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13071 *p++ = '0';
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13072 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13073 {
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13074 while (d > 0)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13075 {
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13076 *p++ = d % 10 + '0';
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13077 d /= 10;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13078 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13079 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13080
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13081 for (width -= (int) (p - buf); width > 0; --width)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13082 *p++ = ' ';
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13083 *p-- = '\0';
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13084 while (p > buf)
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13085 {
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13086 d = *buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13087 *buf++ = *p;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13088 *p-- = d;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13089 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13090 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13091
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13092 /* 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
13093 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
13094 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
13095
24868
de2065294ca3 (invalid_eol_type): Make it unsigned.
Karl Heuer <kwzh@gnu.org>
parents: 24711
diff changeset
13096 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
13097
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13098 static char *
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13099 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
13100 Lisp_Object coding_system;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13101 register char *buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13102 int eol_flag;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13103 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
13104 Lisp_Object val;
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
13105 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
13106 unsigned char *eol_str;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13107 int eol_str_len;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13108 /* The EOL conversion we are using. */
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13109 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
13110
27721
c2a9f4621f9a (decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents: 27681
diff changeset
13111 val = Fget (coding_system, Qcoding_system);
31610
29c6825c59a8 (handle_fontified_prop): While running fontification
Gerd Moellmann <gerd@gnu.org>
parents: 31506
diff changeset
13112 eoltype = Qnil;
27721
c2a9f4621f9a (decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents: 27681
diff changeset
13113
c2a9f4621f9a (decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents: 27681
diff changeset
13114 if (!VECTORP (val)) /* Not yet decided. */
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13115 {
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
13116 if (multibyte)
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
13117 *buf++ = '-';
18677
7648eb8e46d2 (decode_mode_spec_coding): Really don't display
Richard M. Stallman <rms@gnu.org>
parents: 18653
diff changeset
13118 if (eol_flag)
24215
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13119 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
13120 /* 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
13121 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13122 else
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13123 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
13124 Lisp_Object eolvalue;
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
13125
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
13126 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
13127
19045
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
13128 if (multibyte)
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
13129 *buf++ = XFASTINT (XVECTOR (val)->contents[1]);
59ccb8fd4ee1 (redisplay_window): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 19015
diff changeset
13130
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13131 if (eol_flag)
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13132 {
18525
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
13133 /* 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
13134
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
13135 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
13136 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
13137 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
13138 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
13139 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
13140 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
13141 ? eol_mnemonic_unix
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
13142 : (XFASTINT (eolvalue) == 1
92d4f44969c6 (decode_mode_spec_coding): Clean up handling of eol conversions.
Richard M. Stallman <rms@gnu.org>
parents: 18458
diff changeset
13143 ? eol_mnemonic_dos : eol_mnemonic_mac));
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13144 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13145 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13146
24215
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13147 if (eol_flag)
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13148 {
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13149 /* 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
13150 if (STRINGP (eoltype))
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13151 {
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13152 eol_str = XSTRING (eoltype)->data;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13153 eol_str_len = XSTRING (eoltype)->size;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13154 }
24511
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
13155 else if (INTEGERP (eoltype)
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
13156 && CHAR_VALID_P (XINT (eoltype), 0))
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
13157 {
27721
c2a9f4621f9a (decode_mode_spec_coding): Delete superfluous code.
Kenichi Handa <handa@m17n.org>
parents: 27681
diff changeset
13158 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
13159 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
13160 }
24215
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13161 else
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13162 {
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13163 eol_str = invalid_eol_type;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13164 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
13165 }
24511
6dbea1df5686 (decode_mode_spec_coding): Handle integer value in
Kenichi Handa <handa@m17n.org>
parents: 24487
diff changeset
13166 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
13167 buf += eol_str_len;
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13168 }
6e1f6e29422a (decode_mode_spec_coding): Fix previous change.
Eli Zaretskii <eliz@gnu.org>
parents: 24199
diff changeset
13169
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13170 return buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13171 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13172
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13173 /* 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
13174 generated by character C. PRECISION >= 0 means don't return a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13175 string longer than that value. FIELD_WIDTH > 0 means pad the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13176 string returned with spaces to that value. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13177
1017
d42877206c0a * xdisp.c (display_mode_line): Use x_implicitly_set_name here.
Jim Blandy <jimb@redhat.com>
parents: 973
diff changeset
13178 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
13179
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13180 static char *
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13181 decode_mode_spec (w, c, field_width, precision)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13182 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
13183 register int c;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13184 int field_width, precision;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13185 {
6518
07ecb7a5c916 (x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6415
diff changeset
13186 Lisp_Object obj;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13187 struct frame *f = XFRAME (WINDOW_FRAME (w));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13188 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
13189 struct buffer *b = XBUFFER (w->buffer);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13190
6518
07ecb7a5c916 (x_consider_frame_title, decode_mode_spec): Use assignment, not initialization.
Karl Heuer <kwzh@gnu.org>
parents: 6415
diff changeset
13191 obj = Qnil;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13192
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13193 switch (c)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13194 {
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13195 case '*':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13196 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
13197 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13198 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
13199 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13200 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13201
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13202 case '+':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13203 /* 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
13204 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
13205 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13206 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
13207 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13208 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13209
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13210 case '&':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13211 /* 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
13212 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
13213 return "*";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13214 return "-";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13215
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13216 case '%':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13217 return "%";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13218
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13219 case '[':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13220 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13221 int i;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13222 char *p;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13223
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13224 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
13225 return "[[[... ";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13226 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
13227 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
13228 *p++ = '[';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13229 *p = 0;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13230 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
13231 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13232
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13233 case ']':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13234 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13235 int i;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13236 char *p;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13237
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13238 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
13239 return " ...]]]";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13240 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
13241 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
13242 *p++ = ']';
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13243 *p = 0;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13244 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
13245 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13246
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13247 case '-':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13248 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13249 register int i;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13250
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13251 /* Let lots_of_dashes be a string of infinite length. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13252 if (field_width <= 0
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13253 || field_width > sizeof (lots_of_dashes))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13254 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13255 for (i = 0; i < FRAME_MESSAGE_BUF_SIZE (f) - 1; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13256 decode_mode_spec_buf[i] = '-';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13257 decode_mode_spec_buf[i] = '\0';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13258 return decode_mode_spec_buf;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13259 }
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13260 else
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13261 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
13262 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13263
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13264 case 'b':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13265 obj = b->name;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13266 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13267
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13268 case 'c':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13269 {
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13270 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
13271 XSETFASTINT (w->column_number_displayed, col);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13272 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
13273 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
13274 }
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13275
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13276 case 'F':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13277 /* %F displays the frame name. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13278 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
13279 return (char *) XSTRING (f->title)->data;
15382
274f64e997f0 (redisplay_internal): Use FRAME_WINDOW_P.
Richard M. Stallman <rms@gnu.org>
parents: 15381
diff changeset
13280 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
13281 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
13282 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
13283
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13284 case 'f':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13285 obj = b->filename;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13286 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13287
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13288 case 'l':
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13289 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13290 int startpos = XMARKER (w->start)->charpos;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13291 int startpos_byte = marker_byte_position (w->start);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13292 int line, linepos, linepos_byte, topline;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13293 int nlines, junk;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13294 int height = XFASTINT (w->height);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13295
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13296 /* 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
13297 don't forget that too fast. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13298 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
13299 goto no_value;
16463
c6a338fd1938 (decode_mode_spec): In the `L' case,
Richard M. Stallman <rms@gnu.org>
parents: 16397
diff changeset
13300 /* 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
13301 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
13302 w->base_line_pos = Qnil;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13304 /* 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
13305 if (INTEGERP (Vline_number_display_limit)
29632
96d83d5a48b3 (Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 29515
diff changeset
13306 && 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
13307 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13308 w->base_line_pos = Qnil;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13309 w->base_line_number = Qnil;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13310 goto no_value;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13311 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13312
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13313 if (!NILP (w->base_line_number)
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13314 && !NILP (w->base_line_pos)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13315 && XFASTINT (w->base_line_pos) <= startpos)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13316 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13317 line = XFASTINT (w->base_line_number);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13318 linepos = XFASTINT (w->base_line_pos);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13319 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
13320 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13321 else
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13322 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13323 line = 1;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13324 linepos = BUF_BEGV (b);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13325 linepos_byte = BUF_BEGV_BYTE (b);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13326 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13327
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13328 /* 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
13329 nlines = display_count_lines (linepos, linepos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13330 startpos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13331 startpos, &junk);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13332
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13333 topline = nlines + line;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13334
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13335 /* 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
13336 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
13337 "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
13338 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
13339 if (startpos == BUF_BEGV (b))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13340 {
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
13341 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
13342 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
13343 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13344 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
13345 || linepos == BUF_BEGV (b))
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13346 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13347 int limit = BUF_BEGV (b);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13348 int limit_byte = BUF_BEGV_BYTE (b);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13349 int position;
25258
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
13350 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
13351
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13352 if (startpos - distance > limit)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13353 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13354 limit = startpos - distance;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13355 limit_byte = CHAR_TO_BYTE (limit);
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
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13358 nlines = display_count_lines (startpos, startpos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13359 limit_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13360 - (height * 2 + 30),
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13361 &position);
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13362 /* 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
13363 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
13364 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
13365 if (position == limit_byte && limit == startpos - distance)
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13366 {
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13367 w->base_line_pos = w->buffer;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13368 w->base_line_number = Qnil;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13369 goto no_value;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13370 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13371
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
13372 XSETFASTINT (w->base_line_number, topline - nlines);
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13373 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
13374 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13375
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13376 /* 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
13377 nlines = display_count_lines (startpos, startpos_byte,
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13378 PT_BYTE, PT, &junk);
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13379
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13380 /* Record that we did display the line number. */
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13381 line_number_displayed = 1;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13382
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13383 /* Make the string to show. */
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13384 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
13385 return decode_mode_spec_buf;
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13386 no_value:
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13387 {
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13388 char* p = decode_mode_spec_buf;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13389 int pad = field_width - 2;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13390 while (pad-- > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13391 *p++ = ' ';
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13392 *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
13393 *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
13394 *p = '\0';
12598
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13395 return decode_mode_spec_buf;
43ebbbe0299f (decode_mode_spec): New arg spec_width.
Richard M. Stallman <rms@gnu.org>
parents: 12493
diff changeset
13396 }
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13397 }
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13398 break;
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
13399
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13400 case 'm':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13401 obj = b->mode_name;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13402 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13403
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13404 case 'n':
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13405 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
13406 return " Narrow";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13407 break;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13408
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13409 case 'p':
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13410 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13411 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
13412 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
13413
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13414 if (XFASTINT (w->window_end_pos) <= BUF_Z (b) - BUF_ZV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13415 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13416 if (pos <= BUF_BEGV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13417 return "All";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13418 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13419 return "Bottom";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13420 }
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13421 else if (pos <= BUF_BEGV (b))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13422 return "Top";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13423 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13424 {
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
13425 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
13426 /* 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
13427 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
13428 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
13429 total = ((pos - BUF_BEGV (b)) * 100 + total - 1) / total;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13430 /* We can't normally display a 3-digit number,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13431 so get us a 2-digit number that is close. */
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13432 if (total == 100)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13433 total = 99;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13434 sprintf (decode_mode_spec_buf, "%2d%%", total);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13435 return decode_mode_spec_buf;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13436 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13437 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13438
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13439 /* 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
13440 case 'P':
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13441 {
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13442 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
13443 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
13444 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
13445
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13446 if (botpos >= BUF_ZV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13447 {
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13448 if (toppos <= BUF_BEGV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13449 return "All";
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13450 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13451 return "Bottom";
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13452 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13453 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13454 {
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
13455 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
13456 /* 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
13457 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
13458 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
13459 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
13460 /* 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
13461 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
13462 if (total == 100)
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13463 total = 99;
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13464 if (toppos <= BUF_BEGV (b))
5903
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13465 sprintf (decode_mode_spec_buf, "Top%2d%%", total);
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13466 else
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13467 sprintf (decode_mode_spec_buf, "%2d%%", total);
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13468 return decode_mode_spec_buf;
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13469 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13470 }
0aea60a8c2d5 (decode_mode_spec): Implement `P'.
Richard M. Stallman <rms@gnu.org>
parents: 5883
diff changeset
13471
11291
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13472 case 's':
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13473 /* 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
13474 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
13475 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
13476 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
13477 #ifdef subprocesses
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13478 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
13479 #endif
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13480 break;
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13481
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13482 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
13483 #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
13484 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
13485 #else
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13486 return "T";
856fe1d1f30d (redisplay): Don't call update_frame for non-selected termcap frame.
Richard M. Stallman <rms@gnu.org>
parents: 11284
diff changeset
13487 #endif
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13488
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13489 case 'z':
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13490 /* 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
13491 case 'Z':
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13492 /* coding-system (including end-of-line type) */
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13493 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13494 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
13495 char *p = decode_mode_spec_buf;
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13496
19562
318a3a6a8ff5 (decode_mode_spec): For %Z and %z, put keyboard and
Richard M. Stallman <rms@gnu.org>
parents: 19478
diff changeset
13497 if (! FRAME_WINDOW_P (f))
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13498 {
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
13499 /* 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
13500 to do EOL conversion. */
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
13501 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
13502 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
13503 }
18684
76bdd57b476d (decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents: 18677
diff changeset
13504 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
13505 p, eol_flag);
18684
76bdd57b476d (decode_mode_spec) <z,Z>: Display buffer coding system
Richard M. Stallman <rms@gnu.org>
parents: 18677
diff changeset
13506
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
13507 #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
13508 #ifdef subprocesses
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13509 obj = Fget_buffer_process (Fcurrent_buffer ());
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13510 if (PROCESSP (obj))
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13511 {
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13512 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
13513 p, eol_flag);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13514 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
13515 p, eol_flag);
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13516 }
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13517 #endif /* subprocesses */
18652
8873a10882dc (display_menu_bar): Always pass W to display_string.
Richard M. Stallman <rms@gnu.org>
parents: 18525
diff changeset
13518 #endif /* 0 */
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13519 *p = 0;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13520 return decode_mode_spec_buf;
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13521 }
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13522 }
8772
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
13523
9104
610e18fd64a9 (redisplay, mark_window_display_accurate, try_window_id, display_text_line,
Karl Heuer <kwzh@gnu.org>
parents: 9088
diff changeset
13524 if (STRINGP (obj))
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13525 return (char *) XSTRING (obj)->data;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13526 else
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13527 return "";
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13528 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13529
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13530
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13531 /* 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
13532 But don't go beyond LIMIT_BYTE.
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13533 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
13534
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13535 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
13536
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13537 static int
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13538 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
13539 int start, start_byte, limit_byte, count;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13540 int *byte_pos_ptr;
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13541 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13542 register unsigned char *cursor;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13543 unsigned char *base;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13544
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13545 register int ceiling;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13546 register unsigned char *ceiling_addr;
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13547 int orig_count = count;
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13548
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13549 /* If we are not in selective display mode,
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13550 check only for newlines. */
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13551 int selective_display = (!NILP (current_buffer->selective_display)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13552 && !INTEGERP (current_buffer->selective_display));
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13553
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13554 if (count > 0)
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13555 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13556 while (start_byte < limit_byte)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13557 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13558 ceiling = BUFFER_CEILING_OF (start_byte);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13559 ceiling = min (limit_byte - 1, ceiling);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13560 ceiling_addr = BYTE_POS_ADDR (ceiling) + 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13561 base = (cursor = BYTE_POS_ADDR (start_byte));
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13562 while (1)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13563 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13564 if (selective_display)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13565 while (*cursor != '\n' && *cursor != 015 && ++cursor != ceiling_addr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13566 ;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13567 else
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13568 while (*cursor != '\n' && ++cursor != ceiling_addr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13569 ;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13570
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13571 if (cursor != ceiling_addr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13572 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13573 if (--count == 0)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13574 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13575 start_byte += cursor - base + 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13576 *byte_pos_ptr = start_byte;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13577 return orig_count;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13578 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13579 else
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13580 if (++cursor == ceiling_addr)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13581 break;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13582 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13583 else
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13584 break;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13585 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13586 start_byte += cursor - base;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13587 }
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13588 }
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13589 else
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13590 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13591 while (start_byte > limit_byte)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13592 {
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13593 ceiling = BUFFER_FLOOR_OF (start_byte - 1);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13594 ceiling = max (limit_byte, ceiling);
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13595 ceiling_addr = BYTE_POS_ADDR (ceiling) - 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13596 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
13597 while (1)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13598 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13599 if (selective_display)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13600 while (--cursor != ceiling_addr
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13601 && *cursor != '\n' && *cursor != 015)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13602 ;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13603 else
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13604 while (--cursor != ceiling_addr && *cursor != '\n')
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13605 ;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13606
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13607 if (cursor != ceiling_addr)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13608 {
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13609 if (++count == 0)
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13610 {
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13611 start_byte += cursor - base + 1;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13612 *byte_pos_ptr = start_byte;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13613 /* When scanning backwards, we should
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13614 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
13615 return - orig_count - 1;
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13616 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13617 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13618 else
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13619 break;
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13620 }
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13621 /* 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
13622 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
13623 start_byte += cursor - base + 1;
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13624 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13625 }
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13626
20536
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13627 *byte_pos_ptr = limit_byte;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13628
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13629 if (count < 0)
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13630 return - orig_count + count;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13631 return orig_count - count;
8f88438d9f61 (redisplay_internal): Use scan_newline.
Richard M. Stallman <rms@gnu.org>
parents: 20521
diff changeset
13632
8622
4ce43042e7ad (display_scan_buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8594
diff changeset
13633 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13634
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13635
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13636
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13637 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13638 Displaying strings
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13639 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13640
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13641 /* Display a NUL-terminated string, starting with index START.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13642
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13643 If STRING is non-null, display that C string. Otherwise, the Lisp
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13644 string LISP_STRING is displayed.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13645
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13646 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
13647 FACE_STRING. Display STRING or LISP_STRING with the face at
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13648 FACE_STRING_POS in FACE_STRING:
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13649
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13650 Display the string in the environment given by IT, but use the
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13651 standard display table, temporarily.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13652
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13653 FIELD_WIDTH is the minimum number of output glyphs to produce.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13654 If STRING has fewer characters than FIELD_WIDTH, pad to the right
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13655 with spaces. If STRING has more characters, more than FIELD_WIDTH
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13656 glyphs will be produced. FIELD_WIDTH <= 0 means don't pad.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13657
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13658 PRECISION is the maximum number of characters to output from
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13659 STRING. PRECISION < 0 means don't truncate the string.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13660
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13661 This is roughly equivalent to printf format specifiers:
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 FIELD_WIDTH PRECISION PRINTF
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13664 ----------------------------------------
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13665 -1 -1 %s
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13666 -1 10 %.10s
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13667 10 -1 %10s
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13668 20 10 %20.10s
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13669
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13670 MULTIBYTE zero means do not display multibyte chars, > 0 means do
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13671 display them, and < 0 means obey the current buffer's value of
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13672 enable_multibyte_characters.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13673
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13674 Value is the number of glyphs produced. */
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13675
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13676 static int
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13677 display_string (string, lisp_string, face_string, face_string_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13678 start, it, field_width, precision, max_x, multibyte)
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13679 unsigned char *string;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13680 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
13681 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
13682 int face_string_pos;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13683 int start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13684 struct it *it;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13685 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
13686 int multibyte;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13687 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13688 int hpos_at_start = it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13689 int saved_face_id = it->face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13690 struct glyph_row *row = it->glyph_row;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13691
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13692 /* Initialize the iterator IT for iteration over STRING beginning
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13693 with index START. We assume that IT may be modified here (which
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13694 means that display_line has to do something when displaying a
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13695 mini-buffer prompt, which it does). */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13696 reseat_to_string (it, string, lisp_string, start,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13697 precision, field_width, multibyte);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13698
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13699 /* If displaying STRING, set up the face of the iterator
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13700 from LISP_STRING, if that's given. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13701 if (STRINGP (face_string))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13702 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13703 int endptr;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13704 struct face *face;
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 it->face_id
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13707 = face_at_string_position (it->w, face_string, face_string_pos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13708 0, it->region_beg_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13709 it->region_end_charpos,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13710 &endptr, it->base_face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13711 face = FACE_FROM_ID (it->f, it->face_id);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13712 it->face_box_p = face->box != FACE_NO_BOX;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13713 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13714
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13715 /* 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
13716 beyond the right edge of the window. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13717 if (max_x <= 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13718 max_x = it->last_visible_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13719 else
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13720 max_x = min (max_x, it->last_visible_x);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13721
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13722 /* Skip over display elements that are not visible. because IT->w is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13723 hscrolled. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13724 if (it->current_x < it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13725 move_it_in_display_line_to (it, 100000, it->first_visible_x,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13726 MOVE_TO_POS | MOVE_TO_X);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13727
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13728 row->ascent = it->max_ascent;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13729 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
13730 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
13731 row->phys_height = it->max_phys_ascent + it->max_phys_descent;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13732
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13733 /* 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
13734 past last_visible_x. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13735 while (it->current_x < max_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13736 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13737 int x_before, x, n_glyphs_before, i, nglyphs;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13738
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13739 /* Get the next display element. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13740 if (!get_next_display_element (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13741 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13742
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13743 /* Produce glyphs. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13744 x_before = it->current_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13745 n_glyphs_before = it->glyph_row->used[TEXT_AREA];
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13746 PRODUCE_GLYPHS (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13747
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13748 nglyphs = it->glyph_row->used[TEXT_AREA] - n_glyphs_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13749 i = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13750 x = x_before;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13751 while (i < nglyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13752 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13753 struct glyph *glyph = row->glyphs[TEXT_AREA] + n_glyphs_before + i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13754
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13755 if (!it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13756 && x + glyph->pixel_width > max_x)
5800
295e342614a4 (fix_glyph): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5739
diff changeset
13757 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13758 /* End of continued line or max_x reached. */
35301
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13759 if (CHAR_GLYPH_PADDING_P (*glyph))
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13760 {
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13761 /* A wide character is unbreakable. */
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13762 it->glyph_row->used[TEXT_AREA] = n_glyphs_before;
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13763 it->current_x = x_before;
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13764 }
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13765 else
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13766 {
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13767 it->glyph_row->used[TEXT_AREA] = n_glyphs_before + i;
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13768 it->current_x = x;
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13769 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13770 break;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13771 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13772 else if (x + glyph->pixel_width > it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13773 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13774 /* Glyph is at least partially visible. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13775 ++it->hpos;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13776 if (x < it->first_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13777 it->glyph_row->x = x - it->first_visible_x;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13778 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13779 else
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13780 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13781 /* Glyph is off the left margin of the display area.
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13782 Should not happen. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13783 abort ();
17017
667a3686a447 (display_text_line): Introduce new local variable
Karl Heuer <kwzh@gnu.org>
parents: 16927
diff changeset
13784 }
23647
d87960db41e9 (display_text_line): Check validity of a multibyte
Kenichi Handa <handa@m17n.org>
parents: 23417
diff changeset
13785
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13786 row->ascent = max (row->ascent, it->max_ascent);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13787 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
13788 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
13789 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
13790 it->max_phys_ascent + it->max_phys_descent);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13791 x += glyph->pixel_width;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13792 ++i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13793 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13794
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13795 /* Stop if max_x reached. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13796 if (i < nglyphs)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13797 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13798
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13799 /* Stop at line ends. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13800 if (ITERATOR_AT_END_OF_LINE_P (it))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13801 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13802 it->continuation_lines_width = 0;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13803 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13804 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13805
32460
5d2167f8c6a6 (cursor_row_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 32175
diff changeset
13806 set_iterator_to_next (it, 1);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13807
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13808 /* Stop if truncating at the right edge. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13809 if (it->truncate_lines_p
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13810 && it->current_x >= it->last_visible_x)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13811 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13812 /* Add truncation mark, but don't do it if the line is
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13813 truncated at a padding space. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13814 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
13815 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13816 if (!FRAME_WINDOW_P (it->f))
35301
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13817 {
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13818 int i, n;
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13819
35388
1ad9046911a2 (display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 35379
diff changeset
13820 if (it->current_x > it->last_visible_x)
35301
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13821 {
35388
1ad9046911a2 (display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 35379
diff changeset
13822 for (i = row->used[TEXT_AREA] - 1; i > 0; --i)
1ad9046911a2 (display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 35379
diff changeset
13823 if (!CHAR_GLYPH_PADDING_P (row->glyphs[TEXT_AREA][i]))
1ad9046911a2 (display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 35379
diff changeset
13824 break;
1ad9046911a2 (display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 35379
diff changeset
13825 for (n = row->used[TEXT_AREA]; i < n; ++i)
1ad9046911a2 (display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 35379
diff changeset
13826 {
1ad9046911a2 (display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 35379
diff changeset
13827 row->used[TEXT_AREA] = i;
1ad9046911a2 (display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 35379
diff changeset
13828 produce_special_glyphs (it, IT_TRUNCATION);
1ad9046911a2 (display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 35379
diff changeset
13829 }
35301
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13830 }
35388
1ad9046911a2 (display_string): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 35379
diff changeset
13831 produce_special_glyphs (it, IT_TRUNCATION);
35301
6cb4bc361bf8 (insert_left_trunc_glyphs): Overwrite padding glyphs by
Kenichi Handa <handa@m17n.org>
parents: 35277
diff changeset
13832 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13833 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
13834 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13835 break;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13836 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13837 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13838
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13839 /* Maybe insert a truncation at the left. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13840 if (it->first_visible_x
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13841 && IT_CHARPOS (*it) > 0)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13842 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13843 if (!FRAME_WINDOW_P (it->f))
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13844 insert_left_trunc_glyphs (it);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13845 it->glyph_row->truncated_on_left_p = 1;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13846 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13847
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13848 it->face_id = saved_face_id;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13849
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13850 /* Value is number of columns displayed. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13851 return it->hpos - hpos_at_start;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13852 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13853
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13854
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13855
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13856 /* 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
13857 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
13858 If PROPVAL is a list, compare each element against LIST in that
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13859 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
13860 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
13861
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13862 int
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13863 invisible_p (propval, list)
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13864 register Lisp_Object propval;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13865 Lisp_Object list;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13866 {
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
13867 register Lisp_Object tail, proptail;
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13868
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13869 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
13870 {
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13871 register Lisp_Object tem;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13872 tem = XCAR (tail);
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13873 if (EQ (propval, tem))
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13874 return 1;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13875 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
13876 return 1;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13877 }
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13878
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
13879 if (CONSP (propval))
31338
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13880 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13881 for (proptail = propval; CONSP (proptail); proptail = XCDR (proptail))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13882 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13883 Lisp_Object propelt;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13884 propelt = XCAR (proptail);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13885 for (tail = list; CONSP (tail); tail = XCDR (tail))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13886 {
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13887 register Lisp_Object tem;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13888 tem = XCAR (tail);
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13889 if (EQ (propelt, tem))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13890 return 1;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13891 if (CONSP (tem) && EQ (propelt, XCAR (tem)))
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13892 return 1;
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13893 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13894 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13895 }
832733dd336e (redisplay_mode_lines): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31294
diff changeset
13896
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13897 return 0;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13898 }
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13899
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13900
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13901 /* 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
13902 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
13903 each element of PROPVAL in that way, and the first time some
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13904 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
13905 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
13906
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13907 int
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13908 invisible_ellipsis_p (propval, list)
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13909 register Lisp_Object propval;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13910 Lisp_Object list;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13911 {
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
13912 register Lisp_Object tail, proptail;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13913
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13914 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
13915 {
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13916 register Lisp_Object tem;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13917 tem = XCAR (tail);
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13918 if (CONSP (tem) && EQ (propval, XCAR (tem)))
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13919 return ! NILP (XCDR (tem));
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13920 }
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13921
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
13922 if (CONSP (propval))
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13923 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
13924 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
13925 Lisp_Object propelt;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13926 propelt = XCAR (proptail);
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13927 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
13928 {
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
13929 register Lisp_Object tem;
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13930 tem = XCAR (tail);
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13931 if (CONSP (tem) && EQ (propelt, XCAR (tem)))
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13932 return ! NILP (XCDR (tem));
11066
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
13933 }
2a3d961889b4 (invisible_p, invisible_ellipsis_p): Handle list
Richard M. Stallman <rms@gnu.org>
parents: 11065
diff changeset
13934 }
25519
5e59e2bd26b5 Use XCAR and XCDR instead of XCONS.
Gerd Moellmann <gerd@gnu.org>
parents: 25500
diff changeset
13935
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13936 return 0;
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13937 }
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13938
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13939
10965
1ade2d8b0ae9 (display_text_line): When setting selective_rlen,
Richard M. Stallman <rms@gnu.org>
parents: 10911
diff changeset
13940
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13941 /***********************************************************************
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13942 Initialization
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13943 ***********************************************************************/
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13944
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13945 void
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13946 syms_of_xdisp ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13947 {
25358
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
13948 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
13949 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
13950
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
13951 Vmessage_stack = Qnil;
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
13952 staticpro (&Vmessage_stack);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
13953
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
13954 Qinhibit_redisplay = intern ("inhibit-redisplay");
22543
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
13955 staticpro (&Qinhibit_redisplay);
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
13956
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13957 #if GLYPH_DEBUG
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13958 defsubr (&Sdump_glyph_matrix);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13959 defsubr (&Sdump_glyph_row);
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
13960 defsubr (&Sdump_tool_bar_row);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13961 defsubr (&Strace_redisplay_toggle);
27540
d26783d86d5f (Ftrace_to_stderr) [GLYPH_DEBUG]: New function.
Gerd Moellmann <gerd@gnu.org>
parents: 27118
diff changeset
13962 defsubr (&Strace_to_stderr);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13963 #endif
35517
28fcaa2d37b0 (syms_of_xdisp) <Stool_bar_lines_needed>: Don't defsubr
Eli Zaretskii <eliz@gnu.org>
parents: 35474
diff changeset
13964 #ifdef HAVE_WINDOW_SYSTEM
35465
41e0d3d78491 (Ftool_bar_lines_needed): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 35444
diff changeset
13965 defsubr (&Stool_bar_lines_needed);
35517
28fcaa2d37b0 (syms_of_xdisp) <Stool_bar_lines_needed>: Don't defsubr
Eli Zaretskii <eliz@gnu.org>
parents: 35474
diff changeset
13966 #endif
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13967
7096
a3bf30f1a408 (syms_of_xdisp): Set up Qmenu_bar_update_hook.
Richard M. Stallman <rms@gnu.org>
parents: 6896
diff changeset
13968 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
13969 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
13970
12263
6ceecf7d1ec3 (Qoverriding_terminal_local_map): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12171
diff changeset
13971 staticpro (&Qoverriding_terminal_local_map);
12267
e3421dcda014 Fix previous change.
Karl Heuer <kwzh@gnu.org>
parents: 12263
diff changeset
13972 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
13973
12171
1d5d8a256d88 (update_menu_bar): Use set_buffer_internal_1 to switch bufs.
Karl Heuer <kwzh@gnu.org>
parents: 12141
diff changeset
13974 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
13975 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
13976
13104
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
13977 staticpro (&Qwindow_scroll_functions);
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
13978 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
13979
13584
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
13980 staticpro (&Qredisplay_end_trigger_functions);
3daf8244546e (Qredisplay_end_trigger_functions): Renamed from ..._hook.
Richard M. Stallman <rms@gnu.org>
parents: 13519
diff changeset
13981 Qredisplay_end_trigger_functions = intern ("redisplay-end-trigger-functions");
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13982
21748
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
13983 staticpro (&Qinhibit_point_motion_hooks);
c423e8929f69 (Qinhibit_point_motion_hooks): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 21534
diff changeset
13984 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
13985
28002
694ac11a3e1c (QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 27990
diff changeset
13986 QCdata = intern (":data");
694ac11a3e1c (QCdata): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 27990
diff changeset
13987 staticpro (&QCdata);
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
13988 Qdisplay = intern ("display");
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13989 staticpro (&Qdisplay);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13990 Qspace_width = intern ("space-width");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13991 staticpro (&Qspace_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13992 Qraise = intern ("raise");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13993 staticpro (&Qraise);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13994 Qspace = intern ("space");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13995 staticpro (&Qspace);
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
13996 Qmargin = intern ("margin");
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
13997 staticpro (&Qmargin);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
13998 Qleft_margin = intern ("left-margin");
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
13999 staticpro (&Qleft_margin);
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
14000 Qright_margin = intern ("right-margin");
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14001 staticpro (&Qright_margin);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14002 Qalign_to = intern ("align-to");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14003 staticpro (&Qalign_to);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14004 QCalign_to = intern (":align-to");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14005 staticpro (&QCalign_to);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14006 Qrelative_width = intern ("relative-width");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14007 staticpro (&Qrelative_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14008 QCrelative_width = intern (":relative-width");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14009 staticpro (&QCrelative_width);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14010 QCrelative_height = intern (":relative-height");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14011 staticpro (&QCrelative_height);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14012 QCeval = intern (":eval");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14013 staticpro (&QCeval);
25614
766b6a577f15 (Qwhen): Replaces QCwhen.
Gerd Moellmann <gerd@gnu.org>
parents: 25598
diff changeset
14014 Qwhen = intern ("when");
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
14015 staticpro (&Qwhen);
25677
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
14016 QCfile = intern (":file");
1223d6401ab2 (QCfile): Move here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25660
diff changeset
14017 staticpro (&QCfile);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14018 Qfontified = intern ("fontified");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14019 staticpro (&Qfontified);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14020 Qfontification_functions = intern ("fontification-functions");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14021 staticpro (&Qfontification_functions);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14022 Qtrailing_whitespace = intern ("trailing-whitespace");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14023 staticpro (&Qtrailing_whitespace);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14024 Qimage = intern ("image");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14025 staticpro (&Qimage);
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
14026 Qmessage_truncate_lines = intern ("message-truncate-lines");
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
14027 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
14028 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
14029 staticpro (&Qgrow_only);
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14030
25777
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
14031 last_arrow_position = Qnil;
dabc57e3628f (compute_window_start_on_continuation_line): Handle case
Gerd Moellmann <gerd@gnu.org>
parents: 25755
diff changeset
14032 last_arrow_string = Qnil;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14033 staticpro (&last_arrow_position);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14034 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
14035
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
14036 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
14037 staticpro (&echo_buffer[0]);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
14038 staticpro (&echo_buffer[1]);
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
14039
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
14040 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
14041 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
14042 staticpro (&echo_area_buffer[1]);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14043
30728
a87e28789082 (Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30721
diff changeset
14044 Vmessages_buffer_name = build_string ("*Messages*");
a87e28789082 (Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30721
diff changeset
14045 staticpro (&Vmessages_buffer_name);
a87e28789082 (Vmessages_buffer_name): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 30721
diff changeset
14046
25305
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
14047 DEFVAR_LISP ("show-trailing-whitespace", &Vshow_trailing_whitespace,
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
14048 "Non-nil means highlight trailing whitespace.\n\
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
14049 The face used for trailing whitespace is `trailing-whitespace'.");
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
14050 Vshow_trailing_whitespace = Qnil;
273b3c17ce68 (Qshow_trailing_whitespace): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 25258
diff changeset
14051
22543
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
14052 DEFVAR_LISP ("inhibit-redisplay", &Vinhibit_redisplay,
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
14053 "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
14054 This is used for internal purposes.");
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
14055 Vinhibit_redisplay = Qnil;
32cfe5058f27 (Vinhibit_redisplay, Qinhibit_redisplay): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 22529
diff changeset
14056
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14057 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string,
782
a6d00bdb2b60 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 781
diff changeset
14058 "String (or mode line construct) included (normally) in `mode-line-format'.");
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14059 Vglobal_mode_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14060
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14061 DEFVAR_LISP ("overlay-arrow-position", &Voverlay_arrow_position,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14062 "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
14063 This must be the beginning of a line in order to work.\n\
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14064 See also `overlay-arrow-string'.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14065 Voverlay_arrow_position = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14066
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14067 DEFVAR_LISP ("overlay-arrow-string", &Voverlay_arrow_string,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14068 "String to display as an arrow. See also `overlay-arrow-position'.");
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14069 Voverlay_arrow_string = Qnil;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14070
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14071 DEFVAR_INT ("scroll-step", &scroll_step,
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14072 "*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
14073 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
14074 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
14075 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
14076 `scroll-conservatively' to a large value rather than set this to 1.");
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14077
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
14078 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
14079 "*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
14080 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
14081 in the window.");
16527
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
14082 scroll_conservatively = 0;
2337ed73b33e (scroll_conservatively): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16463
diff changeset
14083
16560
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
14084 DEFVAR_INT ("scroll-margin", &scroll_margin,
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
14085 "*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
14086 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
14087 of the top or bottom of the window.");
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
14088 scroll_margin = 0;
8b1dd6f2222d (scroll_margin): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16554
diff changeset
14089
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14090 #if GLYPH_DEBUG
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14091 DEFVAR_INT ("debug-end-pos", &debug_end_pos, "Don't ask");
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14092 #endif
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14093
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14094 DEFVAR_BOOL ("truncate-partial-width-windows",
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14095 &truncate_partial_width_windows,
769
1f320a0729f8 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 732
diff changeset
14096 "*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
14097 truncate_partial_width_windows = 1;
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14098
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14099 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
14100 "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
14101 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
14102 `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
14103 \n\
33840
e8b1a1d28ff4 (display_menu_bar, display_mode_line): Change the way we
Miles Bader <miles@gnu.org>
parents: 33824
diff changeset
14104 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
14105 mode_line_inverse_video = 1;
2303
00e3cc81c1be (decode_mode_spec): Handle `%l'.
Richard M. Stallman <rms@gnu.org>
parents: 2252
diff changeset
14106
29632
96d83d5a48b3 (Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 29515
diff changeset
14107 DEFVAR_LISP ("line-number-display-limit", &Vline_number_display_limit,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14108 "*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
14109 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
14110 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
14111 Vline_number_display_limit = Qnil;
96d83d5a48b3 (Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 29515
diff changeset
14112
96d83d5a48b3 (Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 29515
diff changeset
14113 DEFVAR_INT ("line-number-display-limit-width",
96d83d5a48b3 (Vline_number_display_limit): Renamed from
Gerd Moellmann <gerd@gnu.org>
parents: 29515
diff changeset
14114 &line_number_display_limit_width,
25258
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
14115 "*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
14116 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
14117 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
14118 line_number_display_limit_width = 200;
8eefac3ecebf (line_number_display_limit_width): New var.
Karl Heuer <kwzh@gnu.org>
parents: 25243
diff changeset
14119
3265
80f57ae8d44e (syms_of_xdisp): Make highlight-nonselected-windows Lisp var.
Richard M. Stallman <rms@gnu.org>
parents: 3165
diff changeset
14120 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
14121 "*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
14122 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
14123
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
14124 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
14125 "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
14126 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
14127 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
14128 `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
14129
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
14130 DEFVAR_LISP ("frame-title-format", &Vframe_title_format,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14131 "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
14132 \(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
14133 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
14134 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
14135 \(see `modify-frame-parameters').");
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
14136 DEFVAR_LISP ("icon-title-format", &Vicon_title_format,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14137 "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
14138 \(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
14139 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
14140 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
14141 \(see `modify-frame-parameters').");
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
14142 Vicon_title_format
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
14143 = Vframe_title_format
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
14144 = Fcons (intern ("multiple-frames"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
14145 Fcons (build_string ("%b"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
14146 Fcons (Fcons (build_string (""),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
14147 Fcons (intern ("invocation-name"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
14148 Fcons (build_string ("@"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
14149 Fcons (intern ("system-name"),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
14150 Qnil)))),
c0a21329d9a7 (multiple_frames, Vframe_title_format, Vicon_title_format): New variables.
Karl Heuer <kwzh@gnu.org>
parents: 8684
diff changeset
14151 Qnil)));
10393
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
14152
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
14153 DEFVAR_LISP ("message-log-max", &Vmessage_log_max,
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
14154 "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
14155 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
14156 the buffer when it becomes large.");
69975187fc41 (Vmessage_log_max): New var.
Karl Heuer <kwzh@gnu.org>
parents: 10303
diff changeset
14157 XSETFASTINT (Vmessage_log_max, 50);
10667
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
14158
bacef13bc2ca (Vwindow_size_change_functions): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10641
diff changeset
14159 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
14160 "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
14161 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
14162 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
14163 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
14164 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
14165 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
14166
ea64c261c72a (Qwindow_scroll_functions, Vwindow_scroll_functions): New variables.
Richard M. Stallman <rms@gnu.org>
parents: 12921
diff changeset
14167 DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14168 "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
14169 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
14170 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
14171 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
14172 Vwindow_scroll_functions = Qnil;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14173
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
14174 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
14175 "*Non-nil means automatically resize tool-bars.\n\
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
14176 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
14177 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
14178 otherwise.");
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
14179 auto_resize_tool_bars_p = 1;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
14180
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
14181 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
14182 "*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
14183 auto_raise_tool_bar_buttons_p = 1;
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
14184
35277
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
14185 DEFVAR_LISP ("tool-bar-button-margin", &Vtool_bar_button_margin,
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
14186 "*Margin around tool-bar buttons in pixels.\n\
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
14187 If an integer, use that for both horizontal and vertical margins.\n\
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
14188 Otherwise, value should be a pair of integers `(HORZ : VERT)' with\n\
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
14189 HORZ specifying the horizontal margin, and VERT specifying the\n\
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
14190 vertical margin.");
a959d4b99e4d (Vtool_bar_button_margin): Replaces tool_bar_button_margin.
Gerd Moellmann <gerd@gnu.org>
parents: 35267
diff changeset
14191 Vtool_bar_button_margin = make_number (1);
25543
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
14192
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
14193 DEFVAR_INT ("tool-bar-button-relief", &tool_bar_button_relief,
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
14194 "Relief thickness of tool-bar buttons.");
6289141fa825 (row_containing_pos): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25519
diff changeset
14195 tool_bar_button_relief = 3;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14196
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14197 DEFVAR_LISP ("fontification-functions", &Vfontification_functions,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14198 "List of functions to call to fontify regions of text.\n\
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14199 Each function is called with one argument POS. Functions must\n\
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14200 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
14201 fontified regions the property `fontified'.\n\
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14202 This variable automatically becomes buffer-local when set.");
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14203 Vfontification_functions = Qnil;
33824
09db0c6cb714 (syms_of_xdisp): Make fontification-functions buffer-local.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33762
diff changeset
14204 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
14205
ba5632c9721a (display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents: 24557
diff changeset
14206 DEFVAR_BOOL ("unibyte-display-via-language-environment",
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14207 &unibyte_display_via_language_environment,
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14208 "*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
14209 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
14210 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
14211 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
14212 displayed according to the current fontset.");
ba5632c9721a (display_text_line): Convert unibyte char to multibyte
Andrew Innes <andrewi@gnu.org>
parents: 24557
diff changeset
14213 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
14214
9747bbf3e480 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25316
diff changeset
14215 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
14216 "*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
14217 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
14218 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
14219 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
14220
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
14221 DEFVAR_LISP ("resize-mini-windows", &Vresize_mini_windows,
34844
4756a759c825 (syms_of_xdisp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34802
diff changeset
14222 "*How to resize mini-windows.\n\
33314
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
14223 A value of nil means don't automatically resize mini-windows.\n\
34844
4756a759c825 (syms_of_xdisp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34802
diff changeset
14224 A value of t means resize them to fit the text displayed in them.\n\
33314
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
14225 A value of `grow-only', the default, means let mini-windows grow\n\
34844
4756a759c825 (syms_of_xdisp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34802
diff changeset
14226 only, until their display becomes empty, at which point the windows\n\
4756a759c825 (syms_of_xdisp): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34802
diff changeset
14227 go back to their normal size.");
33314
d09fc097a22d (syms_of_xdisp): Change doc of max-mini-window-height.
Gerd Moellmann <gerd@gnu.org>
parents: 33099
diff changeset
14228 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
14229
27843
d401b5066063 (cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27721
diff changeset
14230 DEFVAR_BOOL ("cursor-in-non-selected-windows",
34847
67e70bac26c6 (syms_of_xdisp): Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents: 34844
diff changeset
14231 &cursor_in_non_selected_windows,
27843
d401b5066063 (cursor_in_non_selected_windows): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27721
diff changeset
14232 "*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
14233 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
14234 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
14235
a22cc42e941d (init_iterator): Set iterator's extra_line_spacing
Gerd Moellmann <gerd@gnu.org>
parents: 28652
diff changeset
14236 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
14237 "*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
14238 automatic_hscrolling_p = 1;
28984
540ca0531c77 (Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 28932
diff changeset
14239
540ca0531c77 (Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 28932
diff changeset
14240 DEFVAR_LISP ("image-types", &Vimage_types,
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
14241 "List of supported image types.\n\
28984
540ca0531c77 (Vimage_types): Moved here from xfns.c.
Gerd Moellmann <gerd@gnu.org>
parents: 28932
diff changeset
14242 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
14243 Vimage_types = Qnil;
29634
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
14244
ac38155fbce6 (message_truncate_lines, Qmessage_truncate_lines): New
Gerd Moellmann <gerd@gnu.org>
parents: 29632
diff changeset
14245 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
14246 "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
14247 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
14248 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
14249
4bdcc0f0232f (syms_of_xdisp): Defvar Vmenu_bar_update_hook to provide
Dave Love <fx@gnu.org>
parents: 31826
diff changeset
14250 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
14251 "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
14252 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
14253 Vmenu_bar_update_hook = Qnil;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14254 }
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14255
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14256
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14257 /* Initialize this module when Emacs starts. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14258
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21478
diff changeset
14259 void
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14260 init_xdisp ()
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14261 {
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14262 Lisp_Object root_window;
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14263 struct window *mini_w;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14264
33462
d8cd8e1bc659 (current_mode_line_height, current_header_line_height):
Gerd Moellmann <gerd@gnu.org>
parents: 33453
diff changeset
14265 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
14266
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14267 CHARPOS (this_line_start_pos) = 0;
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14268
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14269 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
14270 root_window = FRAME_ROOT_WINDOW (XFRAME (WINDOW_FRAME (mini_w)));
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14271
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14272 if (!noninteractive)
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14273 {
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14274 struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (root_window)));
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14275 int i;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14276
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14277 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
14278 set_window_height (root_window,
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14279 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
14280 0);
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
14281 XSETFASTINT (mini_w->top, FRAME_HEIGHT (f) - 1);
277
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14282 set_window_height (minibuf_window, 1, 0);
3140f2aa89ae Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14283
9325
6f07f6dfe1ee (redisplay, mark_window_display_accurate, redisplay_window, try_window,
Karl Heuer <kwzh@gnu.org>
parents: 9283
diff changeset
14284 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
14285 XSETFASTINT (mini_w->width, FRAME_WIDTH (f));
25012
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14286
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14287 scratch_glyph_row.glyphs[TEXT_AREA] = scratch_glyphs;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14288 scratch_glyph_row.glyphs[TEXT_AREA + 1]
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14289 = scratch_glyphs + MAX_SCRATCH_GLYPHS;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14290
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14291 /* The default ellipsis glyphs `...'. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14292 for (i = 0; i < 3; ++i)
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14293 XSETFASTINT (default_invis_vector[i], '.');
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14294 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14295
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14296 #ifdef HAVE_WINDOW_SYSTEM
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14297 {
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14298 /* Allocate the buffer for frame titles. */
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14299 int size = 100;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14300 frame_title_buf = (char *) xmalloc (size);
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14301 frame_title_buf_end = frame_title_buf + size;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14302 frame_title_ptr = NULL;
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14303 }
583c6bc7fe82 Complete rewrite.
Gerd Moellmann <gerd@gnu.org>
parents: 24928
diff changeset
14304 #endif /* HAVE_WINDOW_SYSTEM */
31876
de16d989722a (help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31849
diff changeset
14305
de16d989722a (help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31849
diff changeset
14306 help_echo_showing_p = 0;
de16d989722a (help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31849
diff changeset
14307 }
de16d989722a (help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31849
diff changeset
14308
de16d989722a (help_echo_showing_p): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 31849
diff changeset
14309