annotate src/redisplay.c @ 4614:afbfad080ddd

The URLs in our current config.guess and config.sub files are obsolete. Update to the latest upstream release to get correct URLs, as well as fixes and enhancements to those scripts.
author Jerry James <james@xemacs.org>
date Wed, 11 Feb 2009 11:09:35 -0700
parents 726060ee587c
children 6540302eedf5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1 /* Display generation from window structure and buffer text.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2 Copyright (C) 1994, 1995, 1996 Board of Trustees, University of Illinois.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3 Copyright (C) 1995 Free Software Foundation, Inc.
3025
facf3239ba30 [xemacs-hg @ 2005-10-25 11:16:19 by ben]
ben
parents: 2552
diff changeset
4 Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003, 2005 Ben Wing.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5 Copyright (C) 1995 Sun Microsystems, Inc.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6 Copyright (C) 1996 Chuck Thompson.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8 This file is part of XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10 XEmacs is free software; you can redistribute it and/or modify it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
11 under the terms of the GNU General Public License as published by the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
12 Free Software Foundation; either version 2, or (at your option) any
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
13 later version.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
14
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
15 XEmacs is distributed in the hope that it will be useful, but WITHOUT
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
18 for more details.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
19
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
20 You should have received a copy of the GNU General Public License
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
21 along with XEmacs; see the file COPYING. If not, write to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
22 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
23 Boston, MA 02111-1307, USA. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
24
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
25 /* Synched up with: Not in FSF. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
26
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
27 /* Author: Chuck Thompson */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
28
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
29 /* Fixed up by Ben Wing for Mule */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
30
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
31 /* This file has been Mule-ized. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
32
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
33 /*****************************************************************************
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
34 The Golden Rules of Redisplay
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
35
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
36 First: It Is Better To Be Correct Than Fast
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
37 Second: Thou Shalt Use Due Caution When Running Elisp From Within Redisplay
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
38 Third: It Is Better To Be Fast Than Not To Be
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
39 ****************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
40
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
41 /* Note: The second rule used to prohibit running Elisp from within
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
42 redisplay, but that's not correct any more -- use
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
43 call*_trapping_problems() or call_with_suspended_errors() instead.
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
44
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
45 --ben
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
46 */
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
47
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
48 #include <config.h>
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
49 #include "lisp.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
50
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
51 #include "buffer.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
52 #include "commands.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
53 #include "debug.h"
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
54 #include "device-impl.h"
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
55 #include "elhash.h"
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
56 #include "events.h"
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
57 #include "extents-impl.h"
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
58 #include "faces.h"
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
59 #include "frame-impl.h"
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
60 #include "glyphs.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
61 #include "gutter.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
62 #include "insdel.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
63 #include "menubar.h"
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
64 #include "objects-impl.h"
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
65 #include "opaque.h"
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
66 #include "process.h"
1292
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
67 #include "profile.h"
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
68 #include "redisplay.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
69 #include "toolbar.h"
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
70 #include "window-impl.h"
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
71 #include "line-number.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
72 #include "file-coding.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
73
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
74 #include "sysfile.h"
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
75
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
76 #ifdef HAVE_TTY
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
77 #include "console-tty.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
78 #endif /* HAVE_TTY */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
79
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
80 /* Note: We have to be careful throughout this code to properly handle
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
81 and differentiate between Ibytes and Ichars.
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
82
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
83 Since strings are generally composed of Ibytes, I've taken the tack
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
84 that any contiguous set of Ibytes is called a "string", while
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
85 any contiguous set of Ichars is called an "array". */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
86
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
87 /* Return value to indicate a failure by an add_*_rune routine to add
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
88 a rune, but no propagation information needs to be returned. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
89 #define ADD_FAILED (prop_block_dynarr *) 1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
90
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
91 #define BEGIN_GLYPHS 0
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
92 #define END_GLYPHS 1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
93 #define LEFT_GLYPHS 2
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
94 #define RIGHT_GLYPHS 3
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
95
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
96 #define VERTICAL_CLIP(w, display) \
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
97 ((WINDOW_TTY_P (w) | (!display && scroll_on_clipped_lines)) \
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
98 ? INT_MAX \
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
99 : vertical_clip)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
100
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
101 /* The following structures are completely private to redisplay.c so
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
102 we put them here instead of in a header file, for modularity. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
103
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
104 /* NOTE: Bytexpos's not Charxpos's in this structure. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
105
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
106 typedef struct position_redisplay_data_type
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
107 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
108 /* This information is normally filled in by the create_*_block
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
109 routines and is used by the add_*_rune routines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
110 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
111 /* if we are working with strings rather than buffers we need a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
112 handle to the string */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
113 Lisp_Object string;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
114 struct device *d;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
115 struct display_block *db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
116 struct display_line *dl;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
117 Ichar ch; /* Character that is to be added. This is
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
118 used to communicate this information to
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
119 add_ichar_rune(). */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
120 Lisp_Object last_charset; /* The charset of the previous character.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
121 Used to optimize some lookups -- we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
122 only have to do some things when
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
123 the charset changes. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
124 face_index last_findex; /* The face index of the previous character.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
125 Needed to ensure the validity of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
126 last_charset optimization. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
127
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
128 int last_char_width; /* The width of the previous character. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
129 int font_is_bogus; /* If true, it means we couldn't instantiate
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
130 the font for this charset, so we substitute
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
131 ~'s from the ASCII charset. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
132 Bytexpos byte_charpos; /* Position of character we are processing. This
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
133 is a Bytexpos, meaning it refers to bytes (not
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
134 chars) and can refer to either buffers (1-based)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
135 or strings (0-based). We need to be careful
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
136 when doing anything that references the text in
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
137 the buffer or string. */
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
138 Bytexpos byte_endpos; /* ????? Unknown, under-used. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
139 int pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
140 int max_pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
141 int blank_width; /* Width of the blank that is to be added.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
142 This is used to communicate this information
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
143 to add_blank_rune().
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
144
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
145 This is also used rather cheesily to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
146 communicate the width of the eol-cursor-size
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
147 blank that exists at the end of the line.
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
148 add_ichar_rune() is called cheesily with
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
149 the non-printing char '\n', which is stuck
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
150 in the output routines with its width being
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
151 BLANK_WIDTH. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
152 Bytexpos byte_cursor_charpos; /* This stores the buffer position of the
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
153 cursor. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
154 unsigned int cursor_type :3;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
155 int cursor_x; /* rune block cursor is at */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
156 int start_col; /* Number of character columns (each column has
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
157 a width of the default char width) that still
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
158 need to be skipped. This is used for horizontal
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
159 scrolling, where a certain number of columns
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
160 (those off the left side of the screen) need
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
161 to be skipped before anything is displayed. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
162 Bytexpos byte_start_col_enabled;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
163 int start_col_xoffset; /* Number of pixels that still need to
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
164 be skipped. This is used for
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
165 horizontal scrolling of glyphs, where we want
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
166 to be able to scroll over part of the glyph. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
167
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
168 int hscroll_glyph_width_adjust; /* how much the width of the hscroll
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
169 glyph differs from space_width (w).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
170 0 if no hscroll glyph was used,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
171 i.e. the window is not scrolled
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
172 horizontally. Used in tab
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
173 calculations. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
174
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
175 /* Information about the face the text should be displayed in and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
176 any begin-glyphs and end-glyphs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
177 struct extent_fragment *ef;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
178 face_index findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
179
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
180 /* The height of a pixmap may either be predetermined if the user has set a
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
181 baseline value, or it may be dependent on whatever the line ascent and
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
182 descent values end up being, based just on font and pixmap-ascent
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
183 information. In the first case we can immediately update the values, thus
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
184 their inclusion here. In the last case we cannot determine the actual
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
185 contribution to the line height until we have finished laying out all text
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
186 on the line. Thus we propagate the max height of such pixmaps and do a
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
187 final calculation (in calculate_baseline()) after all text has been added
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
188 to the line. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
189 int new_ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
190 int new_descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
191 int max_pixmap_height;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
192 int need_baseline_computation;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
193 int end_glyph_width; /* Well, it is the kitchen sink after all ... */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
194
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
195 Lisp_Object result_str; /* String where we put the result of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
196 generating a formatted string in the modeline. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
197 int is_modeline; /* Non-zero if we're generating the modeline. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
198 Charcount modeline_charpos; /* Number of chars used in result_str so far;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
199 corresponds to bytepos. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
200 Bytecount bytepos; /* Number of bytes used in result_str so far.
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
201 We don't actually copy the bytes into result_str
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
202 until the end because we don't know how big the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
203 string is going to be until then. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
204 } pos_data;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
205
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
206 enum prop_type
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
207 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
208 PROP_STRING,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
209 PROP_CHAR,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
210 PROP_MINIBUF_PROMPT,
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
211 PROP_BLANK,
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
212 PROP_GLYPH
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
213 };
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
214
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
215 /* Data that should be propagated to the next line. Either a single
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
216 Ichar, a string of Ibyte's or a glyph.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
217
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
218 The actual data that is propagated ends up as a Dynarr of these
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
219 blocks.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
220
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
221 prop_blocks are used to indicate that data that was supposed to go
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
222 on the previous line couldn't actually be displayed. Generally this
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
223 shouldn't happen if we are clipping the end of lines. If we are
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
224 wrapping then we need to display the propagation data before moving
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
225 on. Its questionable whether we should wrap or clip glyphs in this
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
226 instance. Most e-lisp relies on clipping so we preserve this
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
227 behavior.
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
228
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
229 #### It's unclean that both Ichars and Ibytes are here.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
230 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
231
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
232 typedef struct prop_block prop_block;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
233 struct prop_block
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
234 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
235 enum prop_type type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
236
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
237 union data
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
238 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
239 struct
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
240 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
241 Ibyte *str;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
242 Bytecount len; /* length of the string. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
243 } p_string;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
244
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
245 struct
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
246 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
247 Ichar ch;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
248 Bytebpos byte_cursor_charpos; /* NOTE: is in Bytebpos's */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
249 unsigned int cursor_type :3;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
250 } p_char;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
251
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
252 struct
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
253 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
254 int width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
255 face_index findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
256 } p_blank;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
257
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
258 struct
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
259 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
260 /* Not used as yet, but could be used to wrap rather than clip glyphs. */
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
261 int width;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
262 Lisp_Object glyph;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
263 } p_glyph;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
264
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
265 } data;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
266 };
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
267
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
268 typedef struct
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
269 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
270 Dynarr_declare (prop_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
271 } prop_block_dynarr;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
272
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
273
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
274 static Charcount generate_fstring_runes (struct window *w, pos_data *data,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
275 Charcount pos, Charcount min_pos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
276 Charcount max_pos, Lisp_Object elt,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
277 int depth, int max_pixsize,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
278 face_index findex, int type,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
279 Charcount *offset,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
280 Lisp_Object cur_ext);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
281 static prop_block_dynarr *add_glyph_rune (pos_data *data,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
282 struct glyph_block *gb,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
283 int pos_type, int allow_cursor,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
284 struct glyph_cachel *cachel);
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
285 static Bytebpos create_text_block (struct window *w, struct display_line *dl,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
286 Bytebpos byte_start_pos,
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
287 prop_block_dynarr **prop,
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
288 int type);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
289 static int create_overlay_glyph_block (struct window *w,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
290 struct display_line *dl);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
291 static void create_left_glyph_block (struct window *w,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
292 struct display_line *dl,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
293 int overlay_width);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
294 static void create_right_glyph_block (struct window *w,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
295 struct display_line *dl);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
296 static void redisplay_windows (Lisp_Object window, int skip_selected);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
297 static void decode_mode_spec (struct window *w, Ichar spec, int type);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
298 static void free_display_line (struct display_line *dl);
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
299 static void update_line_start_cache (struct window *w, Charbpos from,
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
300 Charbpos to, Charbpos point,
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
301 int no_regen);
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
302 static int point_visible (struct window *w, Charbpos point, int type);
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
303 static void calculate_yoffset (struct display_line *dl,
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
304 struct display_block *fixup);
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
305 static void calculate_baseline (pos_data *data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
306
1204
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
307 #ifdef ERROR_CHECK_DISPLAY
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
308 static void sledgehammer_check_redisplay_structs (void);
1204
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
309 #endif /* ERROR_CHECK_DISPLAY */
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
310
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
311 /* This used to be 10 but 30 seems to give much better performance. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
312 #define INIT_MAX_PREEMPTS 30
1268
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
313 static Fixnum max_preempts;
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
314
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
315 #define QUEUED_EVENTS_REQUIRED_FOR_PREEMPTION 4
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
316
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
317 /* Note that doing this can call Lisp. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
318 #define REDISPLAY_PREEMPTION_CHECK \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
319 ((void) \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
320 (preempted = \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
321 (!disable_preemption && \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
322 ((preemption_count < max_preempts) || !NILP (Vexecuting_macro)) && \
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
323 (!INTERACTIVE || \
1268
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
324 detect_input_pending (QUEUED_EVENTS_REQUIRED_FOR_PREEMPTION)))))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
325
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
326 /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
327 * Redisplay global variables.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
328 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
329
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
330 /* We need a third set of display structures for the cursor motion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
331 routines. We used to just give each window a third set. However,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
332 we always fully regenerate the structures when needed so there
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
333 isn't any reason we need more than a single set. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
334 display_line_dynarr *cmotion_display_lines;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
335
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
336 /* We store the extents that we need to generate in a Dynarr and then
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
337 frob them all on at the end of generating the string. We do it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
338 this way rather than adding them as we generate the string because
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
339 we don't store the text into the resulting string until we're done
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
340 (to avoid having to resize the string multiple times), and we don't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
341 want to go around adding extents to a string when the extents might
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
342 stretch off the end of the string. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
343 static EXTENT_dynarr *formatted_string_extent_dynarr;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
344 static Bytecount_dynarr *formatted_string_extent_start_dynarr;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
345 static Bytecount_dynarr *formatted_string_extent_end_dynarr;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
346
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
347
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
348 /* #### probably temporary */
458
c33ae14dd6d0 Import from CVS: tag r21-2-44
cvs
parents: 448
diff changeset
349 Fixnum cache_adjustment;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
350
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
351 /* This holds a string representing the text corresponding to a single
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
352 modeline % spec. */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
353 static Ibyte_dynarr *mode_spec_ibyte_string;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
354
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
355 int in_display; /* 1 if in redisplay. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
356
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
357 /* Whether we should delay size changes. Broken out of
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
358 enter_redisplay_critical_section(). */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
359 int hold_frame_size_changes;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
360
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
361 int disable_preemption; /* Used for debugging redisplay and for
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
362 force-redisplay. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
363
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
364 /* We only allow max_preempts preemptions before we force a redisplay. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
365 static int preemption_count;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
366
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
367 /* Minimum pixel height of clipped bottom display line. */
458
c33ae14dd6d0 Import from CVS: tag r21-2-44
cvs
parents: 448
diff changeset
368 Fixnum vertical_clip;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
369
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
370 /* Minimum visible pixel width of clipped glyphs at right margin. */
458
c33ae14dd6d0 Import from CVS: tag r21-2-44
cvs
parents: 448
diff changeset
371 Fixnum horizontal_clip;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
372
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
373 /* Nonzero means reading single-character input with prompt
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
374 so put cursor on minibuffer after the prompt. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
375 int cursor_in_echo_area;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
376 Lisp_Object Qcursor_in_echo_area;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
377
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
378 /* Nonzero means truncate lines in all windows less wide than the frame */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
379 int truncate_partial_width_windows;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
380
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
381 /* non-nil if a buffer has changed since the last time redisplay completed */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
382 int buffers_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
383 int buffers_changed_set;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
384
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
385 /* non-nil if hscroll has changed somewhere or a buffer has been
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
386 narrowed or widened */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
387 int clip_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
388 int clip_changed_set;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
389
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
390 /* non-nil if any extent has changed since the last time redisplay completed */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
391 int extents_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
392 int extents_changed_set;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
393
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
394 /* non-nil if any face has changed since the last time redisplay completed */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
395 int faces_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
396
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
397 /* Nonzero means some frames have been marked as garbaged */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
398 int frame_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
399
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
400 /* non-zero if any of the builtin display glyphs (continuation,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
401 hscroll, control-arrow, etc) is in need of updating
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
402 somewhere. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
403 int glyphs_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
404 int glyphs_changed_set;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
405
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
406 /* non-zero if any subwindow has been deleted. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
407 int subwindows_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
408 int subwindows_changed_set;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
409
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
410 /* non-zero if any displayed subwindow is in need of updating
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
411 somewhere. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
412 int subwindows_state_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
413 int subwindows_state_changed_set;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
414
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
415 /* This variable is 1 if the icon has to be updated.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
416 It is set to 1 when `frame-icon-glyph' changes. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
417 int icon_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
418 int icon_changed_set;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
419
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
420 /* This variable is 1 if the menubar widget has to be updated.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
421 It is set to 1 by set-menubar-dirty-flag and cleared when the widget
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
422 has been updated. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
423 int menubar_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
424 int menubar_changed_set;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
425
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
426 /* true iff we should redraw the modelines on the next redisplay */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
427 int modeline_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
428 int modeline_changed_set;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
429
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
430 /* non-nil if point has changed in some buffer since the last time
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
431 redisplay completed */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
432 int point_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
433 int point_changed_set;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
434
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
435 /* non-nil if some frame has changed its size */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
436 int size_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
437
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
438 /* non-nil if some device has signaled that it wants to change size */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
439 int asynch_device_change_pending;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
440
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
441 /* non-nil if any toolbar has changed */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
442 int toolbar_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
443 int toolbar_changed_set;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
444
905
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
445 /* Nonzero if some frame has changed the layout of internal elements
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
446 (gutters or toolbars). */
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
447 int frame_layout_changed;
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
448
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
449 /* non-nil if any gutter has changed */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
450 int gutter_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
451 int gutter_changed_set;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
452
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
453 /* non-nil if any window has changed since the last time redisplay completed */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
454 int windows_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
455
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
456 /* non-nil if any frame's window structure has changed since the last
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
457 time redisplay completed */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
458 int windows_structure_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
459
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
460 /* If non-nil, use vertical bar cursor. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
461 Lisp_Object Vbar_cursor;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
462 Lisp_Object Qbar_cursor;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
463
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
464 Lisp_Object Vvisible_bell; /* If true and the terminal will support it
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
465 then the frame will flash instead of
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
466 beeping when an error occurs */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
467
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
468 /* Nonzero means no need to redraw the entire frame on resuming
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
469 a suspended Emacs. This is useful on terminals with multiple pages,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
470 where one page is used for Emacs and another for all else. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
471 int no_redraw_on_reenter;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
472
3360
316fddbf58e2 [xemacs-hg @ 2006-04-25 14:01:52 by stephent]
stephent
parents: 3094
diff changeset
473 Lisp_Object Vwindow_system; /* #### this variable is deprecated
316fddbf58e2 [xemacs-hg @ 2006-04-25 14:01:52 by stephent]
stephent
parents: 3094
diff changeset
474 nil or a symbol naming the window system
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
475 under which emacs is running
3360
316fddbf58e2 [xemacs-hg @ 2006-04-25 14:01:52 by stephent]
stephent
parents: 3094
diff changeset
476 (`x', `gtk', `mswindows', and `tty' are
316fddbf58e2 [xemacs-hg @ 2006-04-25 14:01:52 by stephent]
stephent
parents: 3094
diff changeset
477 supported -- yes, TTYs are window systems
316fddbf58e2 [xemacs-hg @ 2006-04-25 14:01:52 by stephent]
stephent
parents: 3094
diff changeset
478 for this purpose. */
4477
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
479 Lisp_Object Vinitial_device_type;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
480
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
481 Lisp_Object Vglobal_mode_string;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
482
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
483 /* The number of lines scroll a window by when point leaves the window; if
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
484 it is <=0 then point is centered in the window */
458
c33ae14dd6d0 Import from CVS: tag r21-2-44
cvs
parents: 448
diff changeset
485 Fixnum scroll_step;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
486
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
487 /* Scroll up to this many lines, to bring point back on screen. */
458
c33ae14dd6d0 Import from CVS: tag r21-2-44
cvs
parents: 448
diff changeset
488 Fixnum scroll_conservatively;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
489
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
490 /* Marker for where to display an arrow on top of the buffer text. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
491 Lisp_Object Voverlay_arrow_position;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
492 /* String to display for the arrow. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
493 Lisp_Object Voverlay_arrow_string;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
494
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
495 Lisp_Object Qbuffer_list_changed_hook, Vbuffer_list_changed_hook;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
496
458
c33ae14dd6d0 Import from CVS: tag r21-2-44
cvs
parents: 448
diff changeset
497 static Fixnum last_display_warning_tick;
c33ae14dd6d0 Import from CVS: tag r21-2-44
cvs
parents: 448
diff changeset
498 static Fixnum display_warning_tick;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
499 Lisp_Object Qdisplay_warning_buffer;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
500 int inhibit_warning_display;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
501
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
502 Lisp_Object Vleft_margin_width, Vright_margin_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
503 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
504 Lisp_Object Vuse_left_overflow, Vuse_right_overflow;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
505 Lisp_Object Vtext_cursor_visible_p;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
506
1292
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
507 static Lisp_Object QSin_redisplay;
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
508
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
509 static Lisp_Object Vpost_redisplay_actions;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
510
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
511 int column_number_start_at_one;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
512
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
513 Lisp_Object Qtop_bottom;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
514
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
515 #define WINDOW_SCROLLED(w) ((w)->hscroll > 0 || (w)->left_xoffset)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
516
1204
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
517 static const struct memory_description rune_dglyph_description_1[] = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
518 { XD_LISP_OBJECT, offsetof (struct rune_dglyph, glyph) },
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
519 { XD_LISP_OBJECT, offsetof (struct rune_dglyph, extent) },
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
520 { XD_END }
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
521 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
522
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
523 static const struct sized_memory_description rune_dglyph_description = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
524 sizeof (struct rune_dglyph), rune_dglyph_description_1
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
525 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
526
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
527 static const struct memory_description rune_object_description_1[] = {
2551
9f70af3ac939 [xemacs-hg @ 2005-02-03 16:14:02 by james]
james
parents: 2518
diff changeset
528 { XD_BLOCK_ARRAY, RUNE_DGLYPH, 1, { &rune_dglyph_description } },
1204
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
529 { XD_END }
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
530 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
531
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
532 static const struct sized_memory_description rune_object_description = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
533 0, rune_object_description_1
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
534 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
535
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
536 static const struct memory_description rune_description_1[] = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
537 { XD_INT, offsetof (rune, type) },
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
538 { XD_UNION, offsetof (rune, object),
2551
9f70af3ac939 [xemacs-hg @ 2005-02-03 16:14:02 by james]
james
parents: 2518
diff changeset
539 XD_INDIRECT (0, 0), { &rune_object_description } },
1204
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
540 { XD_END }
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
541 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
542
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
543 static const struct sized_memory_description rune_description = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
544 sizeof (rune),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
545 rune_description_1
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
546 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
547
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
548 static const struct memory_description rune_dynarr_description_1[] = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
549 XD_DYNARR_DESC (rune_dynarr, &rune_description),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
550 { XD_END }
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
551 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
552
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
553 static const struct sized_memory_description rune_dynarr_description = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
554 sizeof (rune_dynarr),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
555 rune_dynarr_description_1
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
556 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
557
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
558 static const struct memory_description display_block_description_1[] = {
2367
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
559 { XD_BLOCK_PTR, offsetof (display_block, runes),
2551
9f70af3ac939 [xemacs-hg @ 2005-02-03 16:14:02 by james]
james
parents: 2518
diff changeset
560 1, { &rune_dynarr_description } },
1204
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
561 { XD_END }
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
562 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
563
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
564 static const struct sized_memory_description display_block_description = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
565 sizeof (display_block),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
566 display_block_description_1
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
567 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
568
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
569 static const struct memory_description display_block_dynarr_description_1[] = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
570 XD_DYNARR_DESC (display_block_dynarr, &display_block_description),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
571 { XD_END }
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
572 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
573
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
574 static const struct sized_memory_description display_block_dynarr_description = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
575 sizeof (display_block_dynarr),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
576 display_block_dynarr_description_1
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
577 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
578
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
579 static const struct memory_description glyph_block_description_1[] = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
580 { XD_LISP_OBJECT, offsetof (glyph_block, glyph) },
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
581 { XD_LISP_OBJECT, offsetof (glyph_block, extent) },
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
582 { XD_END }
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
583 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
584
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
585 static const struct sized_memory_description glyph_block_description = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
586 sizeof (glyph_block),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
587 glyph_block_description_1
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
588 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
589
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
590 static const struct memory_description glyph_block_dynarr_description_1[] = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
591 XD_DYNARR_DESC (glyph_block_dynarr, &glyph_block_description),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
592 { XD_END }
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
593 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
594
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
595 static const struct sized_memory_description glyph_block_dynarr_description = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
596 sizeof (glyph_block_dynarr),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
597 glyph_block_dynarr_description_1
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
598 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
599
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
600 static const struct memory_description display_line_description_1[] = {
2367
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
601 { XD_BLOCK_PTR, offsetof (display_line, display_blocks),
2551
9f70af3ac939 [xemacs-hg @ 2005-02-03 16:14:02 by james]
james
parents: 2518
diff changeset
602 1, { &display_block_dynarr_description } },
2367
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
603 { XD_BLOCK_PTR, offsetof (display_line, left_glyphs),
2551
9f70af3ac939 [xemacs-hg @ 2005-02-03 16:14:02 by james]
james
parents: 2518
diff changeset
604 1, { &glyph_block_dynarr_description } },
2367
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
605 { XD_BLOCK_PTR, offsetof (display_line, right_glyphs),
2551
9f70af3ac939 [xemacs-hg @ 2005-02-03 16:14:02 by james]
james
parents: 2518
diff changeset
606 1, { &glyph_block_dynarr_description } },
1204
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
607 { XD_END }
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
608 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
609
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
610 static const struct sized_memory_description display_line_description = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
611 sizeof (display_line),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
612 display_line_description_1
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
613 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
614
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
615 static const struct memory_description display_line_dynarr_description_1[] = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
616 XD_DYNARR_DESC (display_line_dynarr, &display_line_description),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
617 { XD_END }
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
618 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
619
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
620 const struct sized_memory_description display_line_dynarr_description = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
621 sizeof (display_line_dynarr),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
622 display_line_dynarr_description_1
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
623 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
624
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
625
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
626 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
627 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
628 /* low-level interfaces onto device routines */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
629 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
630 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
631
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
632 static int
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
633 redisplay_text_width_ichar_string (struct window *w, int findex,
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
634 Ichar *str, Charcount len)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
635 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
636 unsigned char charsets[NUM_LEADING_BYTES];
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
637 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
638
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
639 find_charsets_in_ichar_string (charsets, str, len);
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
640 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
641 ensure_face_cachel_complete (WINDOW_FACE_CACHEL (w, findex), window,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
642 charsets);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
643 return DEVMETH (XDEVICE (FRAME_DEVICE (XFRAME (WINDOW_FRAME (w)))),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
644 text_width, (XFRAME (WINDOW_FRAME (w)),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
645 WINDOW_FACE_CACHEL (w, findex), str, len));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
646 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
647
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
648 static Ichar_dynarr *rtw_ichar_dynarr;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
649
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
650 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
651 redisplay_text_width_string (struct window *w, int findex,
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
652 Ibyte *nonreloc, Lisp_Object reloc,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
653 Bytecount offset, Bytecount len)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
654 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
655 if (!rtw_ichar_dynarr)
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
656 rtw_ichar_dynarr = Dynarr_new (Ichar);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
657 Dynarr_reset (rtw_ichar_dynarr);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
658
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
659 fixup_internal_substring (nonreloc, reloc, offset, &len);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
660 if (STRINGP (reloc))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
661 nonreloc = XSTRING_DATA (reloc);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
662 convert_ibyte_string_into_ichar_dynarr (nonreloc, len, rtw_ichar_dynarr);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
663 return redisplay_text_width_ichar_string
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
664 (w, findex, Dynarr_atp (rtw_ichar_dynarr, 0),
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
665 Dynarr_length (rtw_ichar_dynarr));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
666 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
667
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
668 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
669 redisplay_frame_text_width_string (struct frame *f, Lisp_Object face,
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
670 Ibyte *nonreloc, Lisp_Object reloc,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
671 Bytecount offset, Bytecount len)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
672 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
673 unsigned char charsets[NUM_LEADING_BYTES];
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
674 Lisp_Object frame;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
675 struct face_cachel cachel;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
676
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
677 if (!rtw_ichar_dynarr)
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
678 rtw_ichar_dynarr = Dynarr_new (Ichar);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
679 Dynarr_reset (rtw_ichar_dynarr);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
680
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
681 fixup_internal_substring (nonreloc, reloc, offset, &len);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
682 if (STRINGP (reloc))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
683 nonreloc = XSTRING_DATA (reloc);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
684 convert_ibyte_string_into_ichar_dynarr (nonreloc, len, rtw_ichar_dynarr);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
685 find_charsets_in_ibyte_string (charsets, nonreloc, len);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
686 reset_face_cachel (&cachel);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
687 cachel.face = face;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
688 frame = wrap_frame (f);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
689 ensure_face_cachel_complete (&cachel, frame, charsets);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
690 return DEVMETH (XDEVICE (FRAME_DEVICE (f)),
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
691 text_width, (f, &cachel, Dynarr_atp (rtw_ichar_dynarr, 0),
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
692 Dynarr_length (rtw_ichar_dynarr)));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
693 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
694
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
695 /* Return the display block from DL of the given TYPE. A display line
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
696 can have only one display block of each possible type. If DL does
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
697 not have a block of type TYPE, one will be created and added to DL. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
698
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
699 struct display_block *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
700 get_display_block_from_line (struct display_line *dl, enum display_type type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
701 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
702 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
703 struct display_block db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
704
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
705 /* Check if this display line already has a block of the desired type and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
706 if so, return it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
707 if (dl->display_blocks)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
708 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
709 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
710 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
711 if (Dynarr_at (dl->display_blocks, elt).type == type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
712 return Dynarr_atp (dl->display_blocks, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
713 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
714
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
715 /* There isn't an active block of the desired type, but there
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
716 might still be allocated blocks we need to reuse. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
717 if (elt < Dynarr_largest (dl->display_blocks))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
718 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
719 struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
720
3025
facf3239ba30 [xemacs-hg @ 2005-10-25 11:16:19 by ben]
ben
parents: 2552
diff changeset
721 /* "add" the block to the list */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
722 Dynarr_increment (dl->display_blocks);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
723
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
724 /* initialize and return */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
725 dbp->type = type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
726 return dbp;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
727 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
728 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
729 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
730 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
731 /* This line doesn't have any display blocks, so initialize the display
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
732 bock array. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
733 dl->display_blocks = Dynarr_new (display_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
734 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
735
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
736 /* The line doesn't have a block of the desired type so go ahead and create
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
737 one and add it to the line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
738 xzero (db);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
739 db.type = type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
740 db.runes = Dynarr_new (rune);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
741 Dynarr_add (dl->display_blocks, db);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
742
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
743 /* Return the newly added display block. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
744 elt = Dynarr_length (dl->display_blocks) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
745
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
746 return Dynarr_atp (dl->display_blocks, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
747 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
748
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
749 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
750 tab_char_width (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
751 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
752 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
753 int char_tab_width = XINT (b->tab_width);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
754
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
755 if (char_tab_width <= 0 || char_tab_width > 1000) char_tab_width = 8;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
756
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
757 return char_tab_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
758 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
759
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
760 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
761 space_width (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
762 {
3659
98af8a976fc3 [xemacs-hg @ 2006-11-05 22:31:31 by aidan]
aidan
parents: 3498
diff changeset
763 /* While tabs are traditionally composed of spaces, for variable-width
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
764 fonts the space character tends to give too narrow a value. So
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
765 we use 'n' instead. Except that we don't. We use the default
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
766 character width for the default face. If this is actually
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
767 defined by the font then it is probably the best thing to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
768 actually use. If it isn't, we have assumed it is 'n' and have
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
769 already calculated its width. Thus we can avoid a call to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
770 XTextWidth on X frames by just querying the default width. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
771 return XFONT_INSTANCE
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
772 (WINDOW_FACE_CACHEL_FONT (w, DEFAULT_INDEX, Vcharset_ascii))->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
773 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
774
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
775 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
776 tab_pix_width (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
777 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
778 return space_width (w) * tab_char_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
779 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
780
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
781 /* Given a pixel position in a window, return the pixel location of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
782 the next tabstop. Tabs are calculated from the left window edge in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
783 terms of spaces displayed in the default face. Formerly the space
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
784 width was determined using the currently active face. That method
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
785 leads to tabstops which do not line up. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
786
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
787 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
788 next_tab_position (struct window *w, int start_pixpos, int left_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
789 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
790 int n_pos = left_pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
791 int pix_tab_width = tab_pix_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
792
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
793 /* Adjust n_pos for any hscrolling which has happened. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
794 if (WINDOW_SCROLLED (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
795 n_pos -= space_width (w) * (w->hscroll - 1) + w->left_xoffset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
796
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
797 while (n_pos <= start_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
798 n_pos += pix_tab_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
799
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
800 return n_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
801 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
802
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
803 /* For the given window, calculate the outside and margin boundaries for a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
804 display line. The whitespace boundaries must be calculated by the text
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
805 layout routines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
806
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
807 layout_bounds
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
808 calculate_display_line_boundaries (struct window *w, int modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
809 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
810 layout_bounds bounds;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
811
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
812 /* Set the outermost boundaries which are the boundaries of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
813 window itself minus the gutters (and minus the scrollbars if this
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
814 is for the modeline). */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
815 if (!modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
816 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
817 bounds.left_out = WINDOW_TEXT_LEFT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
818 bounds.right_out = WINDOW_TEXT_RIGHT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
819 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
820 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
821 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
822 bounds.left_out = WINDOW_MODELINE_LEFT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
823 bounds.right_out = WINDOW_MODELINE_RIGHT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
824 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
825
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
826 /* The inner boundaries mark where the glyph margins are located. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
827 bounds.left_in = bounds.left_out + window_left_margin_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
828 bounds.right_in = bounds.right_out - window_right_margin_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
829
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
830 /* We cannot fully calculate the whitespace boundaries as they
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
831 depend on the contents of the line being displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
832 bounds.left_white = bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
833 bounds.right_white = bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
834
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
835 return bounds;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
836 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
837
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
838 /* This takes a display_block and its containing line and corrects the yoffset
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
839 of each glyph in the block to cater for the ascent of the line as a
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
840 whole. Must be called *after* the line-ascent is known! */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
841
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
842 static void
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
843 calculate_yoffset (struct display_line *dl, struct display_block *fixup)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
844 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
845 int i;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
846 for (i=0; i<Dynarr_length (fixup->runes); i++)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
847 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
848 struct rune *r = Dynarr_atp (fixup->runes,i);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
849 if (r->type == RUNE_DGLYPH)
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
850 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
851 if (r->object.dglyph.ascent < dl->ascent)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
852 r->object.dglyph.yoffset = dl->ascent - r->object.dglyph.ascent +
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
853 r->object.dglyph.descent;
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
854 }
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
855 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
856 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
857
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
858 /* Calculate the textual baseline (the ascent and descent values for the
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
859 display_line as a whole).
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
860
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
861 If the baseline is completely blank, or contains no manually positioned
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
862 glyphs, then the textual baseline is simply the baseline of the default font.
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
863 (The `contains no manually positioned glyphs' part is actually done for
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
864 us by `add_ichar_rune'.)
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
865
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
866 If the baseline contains pixmaps, and they're all manually positioned, then
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
867 the textual baseline location is constrained that way, and we need do no
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
868 work.
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
869
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
870 If the baseline contains pixmaps, and at least one is automatically
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
871 positioned, then the textual ascent is the largest ascent on the line, and
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
872 the textual descent is the largest descent (which is how things are set up at
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
873 entry to this function anyway): except that if the max_ascent + max_descent
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
874 is too small for the height of the line (say you've adjusted the baseline of
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
875 a short glyph, and there's a tall one next to it), then take the ascent and
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
876 descent for the line individually from the largest of the explicitly set
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
877 ascent/descent, and the rescaled ascent/descent of the default font, scaled
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
878 such that the largest glyph will fit.
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
879
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
880 This means that if you have a short glyph (but taller than the default
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
881 font's descent) forced right under the baseline, and a really tall
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
882 automatically positioned glyph, that the descent for the line is just big
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
883 enough for the manually positioned short glyph, and the tall one uses as
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
884 much of that space as the default font would were it as tall as the tall
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
885 glyph; but that the ascent is big enough for the tall glyph to fit.
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
886
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
887 This behaviour means that under no circumstances will changing the baseline
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
888 of a short glyph cause a tall glyph to move around; nor will it move the
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
889 textual baseline more than necessary. (Changing a tall glyph's baseline
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
890 might move the text's baseline arbitrarily, of course.) */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
891
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
892 static void
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
893 calculate_baseline (pos_data *data)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
894 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
895 /* Blank line: baseline is default font's baseline. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
896
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
897 if (!data->new_ascent && !data->new_descent)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
898 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
899 /* We've got a blank line so initialize these values from the default
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
900 face. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
901 default_face_font_info (data->window, &data->new_ascent,
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
902 &data->new_descent, 0, 0, 0);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
903 }
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
904
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
905 /* No automatically positioned glyphs? Return at once. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
906 if (!data->need_baseline_computation)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
907 return;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
908
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
909 /* Is the tallest glyph on the line automatically positioned?
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
910 If it's manually positioned, or it's automatically positioned
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
911 and there's enough room for it anyway, we need do no more work. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
912 if (data->max_pixmap_height > data->new_ascent + data->new_descent)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
913 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
914 int default_font_ascent, default_font_descent, default_font_height;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
915 int scaled_default_font_ascent, scaled_default_font_descent;
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
916
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
917 default_face_font_info (data->window, &default_font_ascent,
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
918 &default_font_descent, &default_font_height,
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
919 0, 0);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
920
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
921 scaled_default_font_ascent = data->max_pixmap_height *
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
922 default_font_ascent / default_font_height;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
923
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
924 data->new_ascent = max (data->new_ascent, scaled_default_font_ascent);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
925
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
926 /* The ascent may have expanded now. Do we still need to grow the descent,
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
927 or are things big enough?
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
928
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
929 The +1 caters for the baseline row itself. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
930 if (data->max_pixmap_height > data->new_ascent + data->new_descent)
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
931 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
932 scaled_default_font_descent = (data->max_pixmap_height *
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
933 default_font_descent / default_font_height) + 1;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
934
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
935 data->new_descent = max (data->new_descent, scaled_default_font_descent);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
936 }
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
937 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
938 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
939
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
940 /* Given a display line and a starting position, ensure that the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
941 contents of the display line accurately represent the visual
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
942 representation of the buffer contents starting from the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
943 position when displayed in the given window. The display line ends
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
944 when the contents of the line reach the right boundary of the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
945 window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
946
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
947 static Charbpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
948 generate_display_line (struct window *w, struct display_line *dl, int bounds,
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
949 Charbpos start_pos, prop_block_dynarr **prop,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
950 int type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
951 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
952 Charbpos ret_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
953 int overlay_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
954 struct buffer *b = XBUFFER (WINDOW_BUFFER (w));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
955
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
956 /* If our caller hasn't already set the boundaries, then do so now. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
957 if (!bounds)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
958 dl->bounds = calculate_display_line_boundaries (w, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
959
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
960 /* Reset what this line is using. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
961 if (dl->display_blocks)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
962 Dynarr_reset (dl->display_blocks);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
963 if (dl->left_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
964 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
965 Dynarr_free (dl->left_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
966 dl->left_glyphs = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
967 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
968 if (dl->right_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
969 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
970 Dynarr_free (dl->right_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
971 dl->right_glyphs = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
972 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
973
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
974 /* We aren't generating a modeline at the moment. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
975 dl->modeline = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
976
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
977 /* Create a display block for the text region of the line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
978 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
979 /* #### urk urk urk!!! Chuck fix this shit! */
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
980 Bytebpos hacked_up_bytebpos =
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
981 create_text_block (w, dl, charbpos_to_bytebpos (b, start_pos),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
982 prop, type);
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
983 if (hacked_up_bytebpos > BYTE_BUF_ZV (b))
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
984 ret_charpos = BUF_ZV (b) + 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
985 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
986 ret_charpos = bytebpos_to_charbpos (b, hacked_up_bytebpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
987 }
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
988 dl->charpos = start_pos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
989 if (dl->end_charpos < dl->charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
990 dl->end_charpos = dl->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
991
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
992 if (MARKERP (Voverlay_arrow_position)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
993 && EQ (w->buffer, Fmarker_buffer (Voverlay_arrow_position))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
994 && start_pos == marker_position (Voverlay_arrow_position)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
995 && (STRINGP (Voverlay_arrow_string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
996 || GLYPHP (Voverlay_arrow_string)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
997 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
998 overlay_width = create_overlay_glyph_block (w, dl);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
999 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1000 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1001 overlay_width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1002
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1003 /* If there are left glyphs associated with any character in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1004 text block, then create a display block to handle them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1005 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1006 create_left_glyph_block (w, dl, overlay_width);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1007
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1008 /* If there are right glyphs associated with any character in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1009 text block, then create a display block to handle them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1010 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1011 create_right_glyph_block (w, dl);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1012
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1013 /* In the future additional types of display blocks may be generated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1014 here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1015
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1016 w->last_redisplay_pos = ret_charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1017
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1018 return ret_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1019 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1020
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1021 /* Adds an hscroll glyph to a display block. If this is called, then
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1022 the block had better be empty.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1023
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1024 Yes, there are multiple places where this function is called but
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1025 that is the way it has to be. Each calling function has to deal
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1026 with byte_start_col_enabled a little differently depending on the
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1027 object being worked with. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1028
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1029 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1030 add_hscroll_rune (pos_data *data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1031 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1032 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1033 prop_block_dynarr *retval;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1034 Bytebpos byte_old_cursor_charpos = data->byte_cursor_charpos;
647
b39c14581166 [xemacs-hg @ 2001-08-13 04:45:47 by ben]
ben
parents: 638
diff changeset
1035 int old_cursor_type = data->cursor_type;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1036 Bytebpos byte_old_charpos = data->byte_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1037
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1038 if (data->cursor_type == CURSOR_ON
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1039 && data->byte_cursor_charpos >= data->byte_start_col_enabled
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1040 && data->byte_cursor_charpos <= data->byte_charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1041 {
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1042 data->byte_cursor_charpos = data->byte_start_col_enabled;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1043 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1044 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1045 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1046 data->cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1047 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1048
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1049 data->byte_endpos = data->byte_charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1050 data->byte_charpos = data->byte_start_col_enabled;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1051
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1052 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1053 gb.glyph = Vhscroll_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1054 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1055 int oldpixpos = data->pixpos;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1056 retval = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1057 GLYPH_CACHEL (XWINDOW (data->window),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1058 HSCROLL_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1059 data->hscroll_glyph_width_adjust =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1060 data->pixpos - oldpixpos - space_width (XWINDOW (data->window));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1061 }
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1062 data->byte_endpos = 0;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1063 data->byte_cursor_charpos = byte_old_cursor_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1064 data->cursor_type = old_cursor_type;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1065 data->byte_charpos = byte_old_charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1066
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1067 data->byte_start_col_enabled = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1068 return retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1069 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1070
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1071 /* Adds a character rune to a display block. If there is not enough room
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1072 to fit the rune on the display block (as determined by the MAX_PIXPOS)
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1073 then it adds nothing and returns ADD_FAILED. If
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1074 NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't allow the char's height
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1075 to affect the total line height. (See add_ibyte_string_runes()). */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1076
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1077 static prop_block_dynarr *
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1078 add_ichar_rune_1 (pos_data *data, int no_contribute_to_line_height)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1079 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1080 struct rune rb, *crb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1081 int width, local;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1082
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1083 if (data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1084 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1085 data->start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1086
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1087 if (data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1088 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1089 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1090
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1091 if (data->byte_start_col_enabled)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1092 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1093 return add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1094 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1095
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1096 if (data->ch == '\n')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1097 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1098 data->font_is_bogus = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1099 /* Cheesy end-of-line pseudo-character. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1100 width = data->blank_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1101 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1102 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1103 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1104 Lisp_Object charset = ichar_charset (data->ch);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1105 if (!EQ (charset, data->last_charset) ||
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1106 data->findex != data->last_findex)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1107 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1108 /* OK, we need to do things the hard way. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1109 struct window *w = XWINDOW (data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1110 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1111 Lisp_Object font_instance =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1112 ensure_face_cachel_contains_charset (cachel, data->window,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1113 charset);
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1114 Lisp_Font_Instance *fi;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1115
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1116 if (EQ (font_instance, Vthe_null_font_instance))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1117 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1118 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1119 data->font_is_bogus = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1120 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1121 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1122 data->font_is_bogus = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1123
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1124 fi = XFONT_INSTANCE (font_instance);
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1125 if (!fi->proportional_p || data->font_is_bogus)
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1126 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1127 Ichar ch = data->font_is_bogus ? '~' : data->ch;
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1128
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1129 data->last_char_width =
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
1130 redisplay_text_width_ichar_string (XWINDOW (data->window),
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1131 data->findex, &ch, 1);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1132 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1133 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1134 data->last_char_width = -1;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1135
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1136 if (!no_contribute_to_line_height)
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1137 {
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1138 data->new_ascent = max (data->new_ascent, (int) fi->ascent);
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1139 data->new_descent = max (data->new_descent, (int) fi->descent);
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1140 }
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1141
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1142 data->last_charset = charset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1143 data->last_findex = data->findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1144 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1145
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1146 width = data->last_char_width;
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1147 if (width < 0) /* proportional fonts */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1148 width = redisplay_text_width_ichar_string (XWINDOW (data->window),
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1149 data->findex,
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1150 &data->ch, 1);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1151 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1152
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1153 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1154 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1155 return ADD_FAILED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1156 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1157
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1158 if (Dynarr_length (data->db->runes) < Dynarr_largest (data->db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1159 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1160 crb = Dynarr_atp (data->db->runes, Dynarr_length (data->db->runes));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1161 local = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1162 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1163 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1164 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1165 crb = &rb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1166 local = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1167 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1168
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1169 crb->findex = data->findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1170 crb->xpos = data->pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1171 crb->width = width;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1172 if (data->byte_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1173 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1174 if (NILP (data->string))
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1175 crb->charpos =
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1176 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1177 (XWINDOW (data->window))),
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1178 data->byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1179 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1180 crb->charpos =
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1181 string_index_byte_to_char (data->string, data->byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1182 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1183 else if (data->is_modeline)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1184 crb->charpos = data->modeline_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1185 else
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1186 /* Text but not in buffer */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1187 crb->charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1188 crb->type = RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1189 crb->object.chr.ch = data->font_is_bogus ? '~' : data->ch;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1190 crb->endpos = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1191
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1192 if (data->cursor_type == CURSOR_ON)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1193 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1194 if (data->byte_charpos == data->byte_cursor_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1195 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1196 crb->cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1197 data->cursor_x = Dynarr_length (data->db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1198 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1199 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1200 crb->cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1201 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1202 else if (data->cursor_type == NEXT_CURSOR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1203 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1204 crb->cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1205 data->cursor_x = Dynarr_length (data->db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1206 data->cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1207 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1208 else if (data->cursor_type == IGNORE_CURSOR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1209 crb->cursor_type = IGNORE_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1210 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1211 crb->cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1212
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1213 if (local)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1214 Dynarr_add (data->db->runes, *crb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1215 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1216 Dynarr_increment (data->db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1217
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1218 data->pixpos += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1219
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1220 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1221 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1222
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1223 static prop_block_dynarr *
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1224 add_ichar_rune (pos_data *data)
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1225 {
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1226 return add_ichar_rune_1 (data, 0);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1227 }
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1228
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1229 /* Given a string C_STRING of length C_LENGTH, call add_ichar_rune for
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1230 each character in the string. Propagate any left-over data unless
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1231 NO_PROP is non-zero. If NO_CONTRIBUTE_TO_LINE_HEIGHT is non-zero, don't
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1232 allow this character to increase the total height of the line. (This is
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1233 used when the character is part of a text glyph. In that case, the
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1234 glyph code itself adjusts the line height as necessary, depending on
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1235 whether glyph-contrib-p is true.) */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1236
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1237 static prop_block_dynarr *
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1238 add_ibyte_string_runes (pos_data *data, Ibyte *c_string,
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1239 Bytecount c_length, int no_prop,
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1240 int no_contribute_to_line_height)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1241 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1242 Ibyte *pos, *end = c_string + c_length;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1243 prop_block_dynarr *prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1244
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1245 /* #### This function is too simplistic. It needs to do the same
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1246 sort of character interpretation (display-table lookup,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1247 ctl-arrow checking), etc. that create_text_block() does.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1248 The functionality to do this in that routine needs to be
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1249 modularized. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1250
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1251 for (pos = c_string; pos < end;)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1252 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1253 Ibyte *old_pos = pos;
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1254
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1255 data->ch = itext_ichar (pos);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1256
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1257 prop = add_ichar_rune_1 (data, no_contribute_to_line_height);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1258
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1259 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1260 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1261 if (no_prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1262 return ADD_FAILED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1263 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1264 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1265 struct prop_block pb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1266 Bytecount len = end - pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1267 prop = Dynarr_new (prop_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1268
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1269 pb.type = PROP_STRING;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1270 pb.data.p_string.str = xnew_array (Ibyte, len);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1271 strncpy ((char *) pb.data.p_string.str, (char *) pos, len);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1272 pb.data.p_string.len = len;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1273
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1274 Dynarr_add (prop, pb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1275 return prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1276 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1277 }
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1278 INC_IBYTEPTR (pos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1279 assert (pos <= end);
464
5aa1854ad537 Import from CVS: tag r21-2-47
cvs
parents: 462
diff changeset
1280 /* #### Duplicate code from add_string_to_fstring_db_runes
5aa1854ad537 Import from CVS: tag r21-2-47
cvs
parents: 462
diff changeset
1281 should we do more?*/
5aa1854ad537 Import from CVS: tag r21-2-47
cvs
parents: 462
diff changeset
1282 data->bytepos += pos - old_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1283 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1284
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1285 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1286 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1287
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1288 /* Add a single rune of the specified width. The area covered by this
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1289 rune will be displayed in the foreground color of the associated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1290 face. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1291
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1292 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1293 add_blank_rune (pos_data *data, struct window *w, int char_tab_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1294 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1295 struct rune rb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1296
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1297 /* If data->start_col is not 0 then this call to add_blank_rune must have
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1298 been to add it as a tab. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1299 if (data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1300 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1301 /* assert (w != NULL) */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1302 prop_block_dynarr *retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1303
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1304 /* If we have still not fully scrolled horizontally, subtract
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
1305 the width of this tab and return. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1306 if (char_tab_width < data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1307 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1308 data->start_col -= char_tab_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1309 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1310 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1311 else if (char_tab_width == data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1312 data->blank_width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1313 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1314 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1315 int spcwid = space_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1316
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1317 if (spcwid >= data->blank_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1318 data->blank_width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1319 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1320 data->blank_width -= spcwid;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1321 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1322
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1323 data->start_col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1324 retval = add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1325
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1326 /* Could be caused by the handling of the hscroll rune. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1327 if (retval != NULL || !data->blank_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1328 return retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1329 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1330
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1331 /* Blank runes are always calculated to fit. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1332 assert (data->pixpos + data->blank_width <= data->max_pixpos);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1333
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1334 rb.findex = data->findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1335 rb.xpos = data->pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1336 rb.width = data->blank_width;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1337 if (data->byte_charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1338 rb.charpos =
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
1339 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))),
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1340 data->byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1341 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1342 /* #### and this is really correct too? */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1343 rb.charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1344 rb.endpos = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1345 rb.type = RUNE_BLANK;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1346
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1347 if (data->cursor_type == CURSOR_ON)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1348 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1349 if (data->byte_charpos == data->byte_cursor_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1350 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1351 rb.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1352 data->cursor_x = Dynarr_length (data->db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1353 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1354 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1355 rb.cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1356 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1357 else if (data->cursor_type == NEXT_CURSOR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1358 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1359 rb.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1360 data->cursor_x = Dynarr_length (data->db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1361 data->cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1362 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1363 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1364 rb.cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1365
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1366 Dynarr_add (data->db->runes, rb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1367 data->pixpos += data->blank_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1368
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1369 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1370 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1371
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1372 /* Add runes representing a character in octal. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1373
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1374 #define ADD_NEXT_OCTAL_RUNE_CHAR do \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1375 { \
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1376 if (add_failed || (add_failed = add_ichar_rune (data))) \
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1377 { \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1378 struct prop_block pb; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1379 if (!prop) \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1380 prop = Dynarr_new (prop_block); \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1381 \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1382 pb.type = PROP_CHAR; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1383 pb.data.p_char.ch = data->ch; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1384 pb.data.p_char.cursor_type = data->cursor_type; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1385 Dynarr_add (prop, pb); \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1386 } \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1387 } while (0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1388
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1389 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1390 add_octal_runes (pos_data *data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1391 {
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1392 prop_block_dynarr *add_failed, *prop = 0;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1393 Ichar orig_char = data->ch;
647
b39c14581166 [xemacs-hg @ 2001-08-13 04:45:47 by ben]
ben
parents: 638
diff changeset
1394 int orig_cursor_type = data->cursor_type;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1395
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1396 /* Initialize */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1397 add_failed = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1398
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1399 if (data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1400 data->start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1401
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1402 if (!data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1403 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1404 if (data->byte_start_col_enabled)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1405 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1406 add_failed = add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1407 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1408 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1409 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1410 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1411 struct window *w = XWINDOW (data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1412
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1413 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1414 gb.glyph = Voctal_escape_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1415 add_failed =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1416 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1417 GLYPH_CACHEL (w, OCT_ESC_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1418 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1419 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1420
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1421 /* We only propagate information if the glyph was partially
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1422 added. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1423 if (add_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1424 return add_failed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1425
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1426 data->cursor_type = IGNORE_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1427
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1428 if (data->ch >= 0x100)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1429 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1430 /* If the character is an extended Mule character, it could have
3498
b03fc4eae965 [xemacs-hg @ 2006-07-08 16:15:54 by aidan]
aidan
parents: 3360
diff changeset
1431 up to 21 bits. For the moment, we treat it as a seven-digit
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1432 octal number. This is not that pretty, but whatever. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1433 data->ch = (7 & (orig_char >> 18)) + '0';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1434 ADD_NEXT_OCTAL_RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1435
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1436 data->ch = (7 & (orig_char >> 15)) + '0';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1437 ADD_NEXT_OCTAL_RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1438
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1439 data->ch = (7 & (orig_char >> 12)) + '0';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1440 ADD_NEXT_OCTAL_RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1441
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1442 data->ch = (7 & (orig_char >> 9)) + '0';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1443 ADD_NEXT_OCTAL_RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1444 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1445
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1446 data->ch = (7 & (orig_char >> 6)) + '0';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1447 ADD_NEXT_OCTAL_RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1448
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1449 data->ch = (7 & (orig_char >> 3)) + '0';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1450 ADD_NEXT_OCTAL_RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1451
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1452 data->ch = (7 & orig_char) + '0';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1453 ADD_NEXT_OCTAL_RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1454
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1455 data->cursor_type = orig_cursor_type;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1456 return NULL;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1457 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1458
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1459 #undef ADD_NEXT_OCTAL_RUNE_CHAR
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1460
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1461 /* Add runes representing a control character to a display block. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1462
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1463 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1464 add_control_char_runes (pos_data *data, struct buffer *b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1465 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1466 if (!NILP (b->ctl_arrow))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1467 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1468 prop_block_dynarr *prop;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1469 Ichar orig_char = data->ch;
647
b39c14581166 [xemacs-hg @ 2001-08-13 04:45:47 by ben]
ben
parents: 638
diff changeset
1470 int old_cursor_type = data->cursor_type;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1471
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1472 /* Initialize */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1473 prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1474
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1475 if (data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1476 data->start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1477
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1478 if (!data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1479 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1480 if (data->byte_start_col_enabled)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1481 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1482 prop_block_dynarr *retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1483
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1484 retval = add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1485 if (retval)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1486 return retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1487 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1488 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1489 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1490 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1491 struct window *w = XWINDOW (data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1492
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1493 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1494 gb.glyph = Vcontrol_arrow_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1495
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1496 /* We only propagate information if the glyph was partially
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1497 added. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1498 if (add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1499 GLYPH_CACHEL (w, CONTROL_GLYPH_INDEX)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1500 return ADD_FAILED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1501 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1502 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1503
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1504 if (orig_char == 0177)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1505 data->ch = '?';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1506 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1507 data->ch = orig_char ^ 0100;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1508 data->cursor_type = IGNORE_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1509
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1510 if (add_ichar_rune (data))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1511 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1512 struct prop_block pb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1513 if (!prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1514 prop = Dynarr_new (prop_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1515
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1516 pb.type = PROP_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1517 pb.data.p_char.ch = data->ch;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1518 pb.data.p_char.cursor_type = data->cursor_type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1519 Dynarr_add (prop, pb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1520 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1521
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1522 data->cursor_type = old_cursor_type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1523 return prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1524 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1525 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1526 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1527 return add_octal_runes (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1528 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1529 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1530
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1531 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1532 add_disp_table_entry_runes_1 (pos_data *data, Lisp_Object entry)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1533 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1534 prop_block_dynarr *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1535
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1536 if (STRINGP (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1537 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1538 prop = add_ibyte_string_runes (data,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1539 XSTRING_DATA (entry),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1540 XSTRING_LENGTH (entry),
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1541 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1542 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1543 else if (GLYPHP (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1544 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1545 if (data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1546 data->start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1547
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1548 if (!data->start_col && data->byte_start_col_enabled)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1549 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1550 prop = add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1551 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1552 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1553 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1554 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1555
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1556 gb.glyph = entry;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1557 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1558 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1559 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1560 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1561 else if (CHAR_OR_CHAR_INTP (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1562 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1563 data->ch = XCHAR_OR_CHAR_INT (entry);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1564 prop = add_ichar_rune (data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1565 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1566 else if (CONSP (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1567 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1568 if (EQ (XCAR (entry), Qformat)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1569 && CONSP (XCDR (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1570 && STRINGP (XCAR (XCDR (entry))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1571 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1572 Lisp_Object format = XCAR (XCDR (entry));
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
1573 Bytebpos len = XSTRING_LENGTH (format);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1574 Ibyte *src = XSTRING_DATA (format), *end = src + len;
2367
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
1575 Ibyte *result = alloca_ibytes (len);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1576 Ibyte *dst = result;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1577
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1578 while (src < end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1579 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1580 Ichar c = itext_ichar (src);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1581 INC_IBYTEPTR (src);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1582 if (c != '%' || src == end)
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1583 dst += set_itext_ichar (dst, c);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1584 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1585 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1586 c = itext_ichar (src);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1587 INC_IBYTEPTR (src);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1588 switch (c)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1589 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1590 /*case 'x':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1591 dst += long_to_string_base ((char *)dst, data->ch, 16);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1592 break;*/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1593 case '%':
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1594 dst += set_itext_ichar (dst, '%');
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1595 break;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1596 /* #### unimplemented */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1597 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1598 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1599 }
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1600 prop = add_ibyte_string_runes (data, result, dst - result, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1601 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1602 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1603
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1604 /* Else blow it off because someone added a bad entry and we don't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1605 have any safe way of signaling an error. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1606 return prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1607 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1608
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1609 /* Given a display table entry, call the appropriate functions to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1610 display each element of the entry. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1611
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1612 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1613 add_disp_table_entry_runes (pos_data *data, Lisp_Object entry)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1614 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1615 prop_block_dynarr *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1616 if (VECTORP (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1617 {
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1618 Lisp_Vector *de = XVECTOR (entry);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1619 EMACS_INT len = vector_length (de);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1620 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1621
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1622 for (elt = 0; elt < len; elt++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1623 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1624 if (NILP (vector_data (de)[elt]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1625 continue;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1626 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1627 prop = add_disp_table_entry_runes_1 (data, vector_data (de)[elt]);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1628 /* Else blow it off because someone added a bad entry and we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1629 don't have any safe way of signaling an error. Hey, this
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1630 comment sounds familiar. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1631
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1632 /* #### Still need to add any remaining elements to the
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
1633 propagation information. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1634 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1635 return prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1636 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1637 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1638 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1639 prop = add_disp_table_entry_runes_1 (data, entry);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1640 return prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1641 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1642
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1643 /* Add runes which were propagated from the previous line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1644
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1645 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1646 add_propagation_runes (prop_block_dynarr **prop, pos_data *data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1647 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1648 /* #### Remember to handle start_col parameter of data when the rest of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1649 this is finished. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1650 /* #### Chuck -- I've redone this function a bit. It looked like the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1651 case of not all the propagation blocks being added was not handled
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1652 well. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1653 /* #### Chuck -- I also think the double indirection of PROP is kind
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1654 of bogus. A cleaner solution is just to check for
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1655 Dynarr_length (prop) > 0. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1656 /* #### This function also doesn't even pay attention to ADD_FAILED!
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1657 This is seriously fucked! Seven ####'s in 130 lines -- is that a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1658 record? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1659 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1660 prop_block_dynarr *add_failed;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1661 Bytebpos byte_old_cursor_charpos = data->byte_cursor_charpos;
647
b39c14581166 [xemacs-hg @ 2001-08-13 04:45:47 by ben]
ben
parents: 638
diff changeset
1662 int old_cursor_type = data->cursor_type;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1663
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1664 for (elt = 0; elt < Dynarr_length (*prop); elt++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1665 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1666 struct prop_block *pb = Dynarr_atp (*prop, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1667
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1668 switch (pb->type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1669 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1670 case PROP_CHAR:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1671 data->ch = pb->data.p_char.ch;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1672 data->byte_cursor_charpos = pb->data.p_char.byte_cursor_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1673 data->cursor_type = pb->data.p_char.cursor_type;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1674 add_failed = add_ichar_rune (data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1675
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1676 if (add_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1677 goto oops_no_more_space;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1678 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1679 case PROP_STRING:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1680 if (pb->data.p_string.str)
1726
a8d8f419b459 [xemacs-hg @ 2003-09-30 15:26:34 by james]
james
parents: 1708
diff changeset
1681 xfree (pb->data.p_string.str, Ibyte *);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1682 /* #### bogus bogus -- this doesn't do anything!
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1683 Should probably call add_ibyte_string_runes(),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1684 once that function is fixed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1685 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1686 case PROP_MINIBUF_PROMPT:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1687 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1688 face_index old_findex = data->findex;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1689 Bytebpos byte_old_charpos = data->byte_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1690
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1691 data->findex = DEFAULT_INDEX;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1692 data->byte_charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1693 data->cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1694
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1695 while (pb->data.p_string.len > 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1696 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1697 data->ch = itext_ichar (pb->data.p_string.str);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1698 add_failed = add_ichar_rune (data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1699
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1700 if (add_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1701 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1702 data->findex = old_findex;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1703 data->byte_charpos = byte_old_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1704 goto oops_no_more_space;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1705 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1706 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1707 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1708 /* Complicated equivalent of ptr++, len-- */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1709 Ibyte *oldpos = pb->data.p_string.str;
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1710 INC_IBYTEPTR (pb->data.p_string.str);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1711 pb->data.p_string.len -= pb->data.p_string.str - oldpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1712 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1713 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1714
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1715 data->findex = old_findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1716 /* ##### FIXME FIXME FIXME -- Upon successful return from
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1717 this function, data->byte_charpos is automatically incremented.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1718 However, we don't want that to happen if we were adding
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1719 the minibuffer prompt. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1720 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1721 struct buffer *buf =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1722 XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1723 /* #### Chuck fix this shit or I'm gonna scream! */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1724 if (byte_old_charpos > BYTE_BUF_BEGV (buf))
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
1725 data->byte_charpos = prev_bytebpos (buf, byte_old_charpos);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
1726 else
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1727 /* #### is this correct? Does anyone know?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1728 Does anyone care? Is this a cheesy hack or what? */
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
1729 data->byte_charpos = BYTE_BUF_BEGV (buf) - 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1730 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1731 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1732 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1733 case PROP_BLANK:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1734 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1735 /* #### I think it's unnecessary and misleading to preserve
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1736 the blank_width, as it implies that the value carries
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1737 over from one rune to the next, which is wrong. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1738 int old_width = data->blank_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1739 face_index old_findex = data->findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1740
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1741 data->findex = pb->data.p_blank.findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1742 data->blank_width = pb->data.p_blank.width;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1743 data->byte_cursor_charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1744 data->cursor_type = IGNORE_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1745
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1746 if (data->pixpos + data->blank_width > data->max_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1747 data->blank_width = data->max_pixpos - data->pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1748
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1749 /* We pass a bogus value of char_tab_width. It shouldn't
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
1750 matter because unless something is really screwed up
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
1751 this call won't cause that arg to be used. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1752 add_failed = add_blank_rune (data, XWINDOW (data->window), 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1753
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1754 /* This can happen in the case where we have a tab which
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
1755 is wider than the window. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1756 if (data->blank_width != pb->data.p_blank.width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1757 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1758 pb->data.p_blank.width -= data->blank_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1759 add_failed = ADD_FAILED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1760 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1761
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1762 data->findex = old_findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1763 data->blank_width = old_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1764
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1765 if (add_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1766 goto oops_no_more_space;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1767 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1768 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1769 default:
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
1770 ABORT ();
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1771 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1772 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1773
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1774 oops_no_more_space:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1775
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1776 data->byte_cursor_charpos = byte_old_cursor_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1777 data->cursor_type = old_cursor_type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1778 if (elt < Dynarr_length (*prop))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1779 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1780 Dynarr_delete_many (*prop, 0, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1781 return *prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1782 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1783 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1784 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1785 Dynarr_free (*prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1786 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1787 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1788 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1789
3025
facf3239ba30 [xemacs-hg @ 2005-10-25 11:16:19 by ben]
ben
parents: 2552
diff changeset
1790 /* Add `text' layout glyphs at position POS_TYPE that are contained to
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1791 the display block, but add all other types to the appropriate list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1792 of the display line. They will be added later by different
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1793 routines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1794
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1795 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1796 add_glyph_rune (pos_data *data, struct glyph_block *gb, int pos_type,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1797 int allow_cursor, struct glyph_cachel *cachel)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1798 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1799 struct window *w = XWINDOW (data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1800
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1801 /* If window faces changed, and glyph instance is text, then
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1802 glyph sizes might have changed too */
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1803 invalidate_glyph_geometry_maybe (gb->glyph, w);
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1804
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1805 /* This makes sure the glyph is in the cachels.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1806
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1807 #### We do this to make sure the glyph is in the glyph cachels,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1808 so that the dirty flag can be reset after redisplay has
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1809 finished. We should do this some other way, maybe by iterating
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1810 over the window cache of subwindows. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1811 get_glyph_cachel_index (w, gb->glyph);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1812
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1813 /* A nil extent indicates a special glyph (ex. truncator). */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1814 if (NILP (gb->extent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1815 || (pos_type == BEGIN_GLYPHS &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1816 extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1817 || (pos_type == END_GLYPHS &&
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1818 extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1819 || pos_type == LEFT_GLYPHS || pos_type == RIGHT_GLYPHS)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1820 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1821 struct rune rb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1822 int width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1823 int xoffset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1824 int ascent, descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1825 Lisp_Object baseline;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1826 Lisp_Object face;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1827 Lisp_Object instance;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1828 face_index findex;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1829 prop_block_dynarr *retval = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1830
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1831 if (cachel)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1832 width = cachel->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1833 else
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
1834 width = glyph_width (gb->glyph, data->window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1835
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1836 if (!width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1837 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1838
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1839 if (data->start_col || data->start_col_xoffset)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1840 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1841 int glyph_char_width = width / space_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1842
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1843 /* If we still have not fully scrolled horizontally after
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
1844 taking into account the width of the glyph, subtract its
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
1845 width and return. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1846 if (glyph_char_width < data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1847 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1848 data->start_col -= glyph_char_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1849 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1850 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1851 else if (glyph_char_width == data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1852 width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1853 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1854 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1855 xoffset = space_width (w) * data->start_col;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1856 width -= xoffset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1857
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1858 /* #### Can this happen? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1859 if (width < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1860 width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1861 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1862
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1863 data->start_col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1864 retval = add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1865
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1866 /* Could be caused by the handling of the hscroll rune. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1867 if (retval != NULL || !width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1868 return retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1869 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1870 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1871 xoffset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1872
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1873 if (data->pixpos + width > data->max_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1874 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1875 /* If this is the first object we are attempting to add to
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1876 the line then we ignore the horizontal_clip threshold.
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1877 Otherwise we will loop until the bottom of the window
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1878 continually failing to add this glyph because it is wider
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1879 than the window. We could alternatively just completely
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1880 ignore the glyph and proceed from there but I think that
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1881 this is a better solution.
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
1882
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1883 This does, however, create a different problem in that we
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1884 can end up adding the object to every single line, never
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1885 getting any further - for instance an extent with a long
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1886 start-glyph that covers multitple following
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1887 characters. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1888 if (Dynarr_length (data->db->runes)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1889 && data->max_pixpos - data->pixpos < horizontal_clip)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1890 return ADD_FAILED;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1891 else {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1892 struct prop_block pb;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1893
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1894 /* We need to account for the width of the end-of-line
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1895 glyph if there is nothing more in the line to display,
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1896 since we will not display it in this instance. It seems
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1897 kind of gross doing it here, but otherwise we have to
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1898 search the runes in create_text_block(). */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1899 if (data->ch == '\n')
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1900 data->max_pixpos += data->end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1901 width = data->max_pixpos - data->pixpos;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1902 /* Add the glyph we are displaying, but clipping, to the
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1903 propagation data so that we don't try and do it
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
1904 again. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1905 retval = Dynarr_new (prop_block);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1906 pb.type = PROP_GLYPH;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1907 pb.data.p_glyph.glyph = gb->glyph;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1908 pb.data.p_glyph.width = width;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1909 Dynarr_add (retval, pb);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1910 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1911 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1912
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1913 if (cachel)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1914 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1915 ascent = cachel->ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1916 descent = cachel->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1917 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1918 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1919 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
1920 ascent = glyph_ascent (gb->glyph, data->window);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
1921 descent = glyph_descent (gb->glyph, data->window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1922 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1923
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1924 baseline = glyph_baseline (gb->glyph, data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1925
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1926 rb.object.dglyph.descent = 0; /* Gets reset lower down, if it is known. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1927
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1928 if (glyph_contrib_p (gb->glyph, data->window))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1929 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1930 /* A pixmap that has not had a baseline explicitly set. Its
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1931 contribution will be determined later. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1932 if (NILP (baseline))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1933 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1934 int height = ascent + descent;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1935 data->need_baseline_computation = 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1936 data->max_pixmap_height = max (data->max_pixmap_height, height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1937 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1938
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1939 /* A string so determine contribution normally. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1940 else if (EQ (baseline, Qt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1941 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1942 data->new_ascent = max (data->new_ascent, ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1943 data->new_descent = max (data->new_descent, descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1944 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1945
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1946 /* A pixmap with an explicitly set baseline. We determine the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1947 contribution here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1948 else if (INTP (baseline))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1949 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1950 int height = ascent + descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1951 int pix_ascent, pix_descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1952
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1953 pix_ascent = height * XINT (baseline) / 100;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1954 pix_descent = height - pix_ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1955
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1956 data->new_ascent = max (data->new_ascent, pix_ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1957 data->new_descent = max (data->new_descent, pix_descent);
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1958 data->max_pixmap_height = max (data->max_pixmap_height, height);
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
1959
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1960 rb.object.dglyph.descent = pix_descent;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1961 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1962
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1963 /* Otherwise something is screwed up. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1964 else
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
1965 ABORT ();
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1966 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1967
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1968 face = glyph_face (gb->glyph, data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1969 if (NILP (face))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1970 findex = data->findex;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1971 else
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1972 findex = get_builtin_face_cache_index (w, face);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1973
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1974 instance = glyph_image_instance (gb->glyph, data->window,
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1975 ERROR_ME_DEBUG_WARN, 1);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1976 if (TEXT_IMAGE_INSTANCEP (instance))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1977 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1978 Lisp_Object string = XIMAGE_INSTANCE_TEXT_STRING (instance);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1979 face_index orig_findex = data->findex;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1980 Bytebpos orig_charpos = data->byte_charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1981 Bytebpos orig_start_col_enabled = data->byte_start_col_enabled;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1982
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1983 data->findex = findex;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1984 data->byte_start_col_enabled = 0;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1985 if (!allow_cursor)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1986 data->byte_charpos = 0;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1987 add_ibyte_string_runes (data, XSTRING_DATA (string),
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1988 XSTRING_LENGTH (string), 0, 1);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1989 data->findex = orig_findex;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1990 data->byte_charpos = orig_charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1991 data->byte_start_col_enabled = orig_start_col_enabled;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1992 return retval;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1993 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1994
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1995 rb.findex = findex;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1996 rb.xpos = data->pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1997 rb.width = width;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1998 rb.charpos = 0; /* glyphs are never "at" anywhere */
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1999 if (data->byte_endpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2000 /* #### is this necessary at all? */
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
2001 rb.endpos = bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (w)),
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2002 data->byte_endpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2003 else
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2004 rb.endpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2005 rb.type = RUNE_DGLYPH;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2006 rb.object.dglyph.glyph = gb->glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2007 rb.object.dglyph.extent = gb->extent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2008 rb.object.dglyph.xoffset = xoffset;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2009 rb.object.dglyph.ascent = ascent;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2010 rb.object.dglyph.yoffset = 0; /* Until we know better, assume that it has
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2011 a normal (textual) baseline. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2012
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2013 if (allow_cursor)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2014 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2015 rb.charpos = bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER (w)),
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2016 data->byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2017
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2018 if (data->cursor_type == CURSOR_ON)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2019 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2020 if (data->byte_charpos == data->byte_cursor_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2021 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2022 rb.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2023 data->cursor_x = Dynarr_length (data->db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2024 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2025 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2026 rb.cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2027 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2028 else if (data->cursor_type == NEXT_CURSOR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2029 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2030 rb.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2031 data->cursor_x = Dynarr_length (data->db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2032 data->cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2033 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2034 else if (data->cursor_type == IGNORE_CURSOR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2035 rb.cursor_type = IGNORE_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2036 else if (data->cursor_type == NO_CURSOR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2037 rb.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2038 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2039 rb.cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2040 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2041 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2042 rb.cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2043
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2044 Dynarr_add (data->db->runes, rb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2045 data->pixpos += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2046
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2047 return retval;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2048 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2049 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2050 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2051 if (!NILP (glyph_face (gb->glyph, data->window)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2052 gb->findex =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2053 get_builtin_face_cache_index (w, glyph_face (gb->glyph,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2054 data->window));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2055 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2056 gb->findex = data->findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2057
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2058 if (pos_type == BEGIN_GLYPHS)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2059 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2060 if (!data->dl->left_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2061 data->dl->left_glyphs = Dynarr_new (glyph_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2062 Dynarr_add (data->dl->left_glyphs, *gb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2063 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2064 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2065 else if (pos_type == END_GLYPHS)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2066 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2067 if (!data->dl->right_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2068 data->dl->right_glyphs = Dynarr_new (glyph_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2069 Dynarr_add (data->dl->right_glyphs, *gb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2070 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2071 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2072 else
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
2073 ABORT (); /* there are no unknown types */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2074 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2075
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2076 return NULL;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2077 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2078
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2079 /* Add all glyphs at position POS_TYPE that are contained in the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2080 data. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2081
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2082 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2083 add_glyph_runes (pos_data *data, int pos_type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2084 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2085 /* #### This still needs to handle the start_col parameter. Duh, Chuck,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2086 why didn't you just modify add_glyph_rune in the first place? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2087 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2088 glyph_block_dynarr *glyph_arr = (pos_type == BEGIN_GLYPHS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2089 ? data->ef->begin_glyphs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2090 : data->ef->end_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2091 prop_block_dynarr *prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2092
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2093 for (elt = 0; elt < Dynarr_length (glyph_arr); elt++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2094 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2095 prop = add_glyph_rune (data, Dynarr_atp (glyph_arr, elt), pos_type, 0,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2096 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2097
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2098 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2099 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2100 /* #### Add some propagation information. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2101 return prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2102 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2103 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2104
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2105 Dynarr_reset (glyph_arr);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2106
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2107 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2108 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2109
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2110 /* Given a position for a buffer in a window, ensure that the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2111 display line DL accurately represents the text on a line starting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2112 at the given position.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2113
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2114 NOTE NOTE NOTE NOTE: This function works with and returns Bytebpos's.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2115 You must do appropriate conversion. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2116
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
2117 static Bytebpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2118 create_text_block (struct window *w, struct display_line *dl,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2119 Bytebpos byte_start_pos, prop_block_dynarr **prop,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2120 int type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2121 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2122 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2123 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2124 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2125
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2126 pos_data data;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2127
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2128 /* Don't display anything in the minibuffer if this window is not on
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2129 a selected frame. We consider all other windows to be active
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2130 minibuffers as it simplifies the coding. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2131 int active_minibuffer = (!MINI_WINDOW_P (w) ||
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2132 (f == device_selected_frame (d)) ||
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2133 is_surrogate_for_selected_frame (f));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2134
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2135 int truncate_win = window_truncation_on (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2136
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2137 /* If the buffer's value of selective_display is an integer then
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2138 only lines that start with less than selective_display columns of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2139 space will be displayed. If selective_display is t then all text
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2140 after a ^M is invisible. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2141 int selective = (INTP (b->selective_display)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2142 ? XINT (b->selective_display)
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
2143 : (!NILP (b->selective_display) ? -1 : 0));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2144
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2145 /* The variable ctl-arrow allows the user to specify what characters
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2146 can actually be displayed and which octal should be used for.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2147 #### This variable should probably have some rethought done to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2148 it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2149
2367
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
2150 See also
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
2151
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
2152 (Info-goto-node "(internals)Future Work -- Display Tables")
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
2153
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
2154 */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2155 Ichar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2156 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2157 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2158 ? 255 : 160));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2159
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2160 Lisp_Object face_dt, window_dt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2161
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2162 /* The text display block for this display line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2163 struct display_block *db = get_display_block_from_line (dl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2164
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2165 /* The first time through the main loop we need to force the glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2166 data to be updated. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2167 int initial = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2168
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2169 /* Apparently the new extent_fragment_update returns an end position
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2170 equal to the position passed in if there are no more runs to be
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2171 displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2172 int no_more_frags = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2173
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2174 Lisp_Object synch_minibuffers_value =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2175 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2176
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2177 dl->used_prop_data = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2178 dl->num_chars = 0;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2179 dl->line_continuation = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2180
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2181 xzero (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2182 data.ef = extent_fragment_new (w->buffer, f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2183
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2184 /* These values are used by all of the rune addition routines. We add
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2185 them to this structure for ease of passing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2186 data.d = d;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
2187 data.window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2188 data.string = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2189 data.db = db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2190 data.dl = dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2191
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2192 data.byte_charpos = byte_start_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2193 data.pixpos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2194 data.last_charset = Qunbound;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2195 data.last_findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2196 data.result_str = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2197
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2198 /* Set the right boundary adjusting it to take into account any end
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2199 glyph. Save the width of the end glyph for later use. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2200 data.max_pixpos = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2201 if (truncate_win)
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2202 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2203 else
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2204 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, CONT_GLYPH_INDEX);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2205 data.max_pixpos -= data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2206
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2207 if (cursor_in_echo_area && MINI_WINDOW_P (w) && echo_area_active (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2208 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2209 data.byte_cursor_charpos = BYTE_BUF_ZV (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2210 data.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2211 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2212 else if (MINI_WINDOW_P (w) && !active_minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2213 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2214 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2215 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2216 d == XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d))))&&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2217 f == XFRAME(DEVICE_SELECTED_FRAME(d)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2218 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2219 data.byte_cursor_charpos = BYTE_BUF_PT (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2220 data.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2221 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2222 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2223 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2224 data.byte_cursor_charpos = byte_marker_position (w->pointm[type]);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2225 data.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2226 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2227 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2228 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2229 data.cursor_x = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2230
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2231 data.start_col = w->hscroll;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2232 data.start_col_xoffset = w->left_xoffset;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2233 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2234 data.hscroll_glyph_width_adjust = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2235
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2236 /* We regenerate the line from the very beginning. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2237 Dynarr_reset (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2238
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2239 /* Why is this less than or equal and not just less than? If the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2240 starting position is already equal to the maximum we can't add
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2241 anything else, right? Wrong. We might still have a newline to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2242 add. A newline can use the room allocated for an end glyph since
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2243 if we add it we know we aren't going to be adding any end
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2244 glyph. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2245
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2246 /* #### Chuck -- I think this condition should be while (1).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2247 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2248 and the begin-glyph ends exactly at the end of the window, the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2249 end-glyph and text might not be displayed. while (1) ensures
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2250 that the loop terminates only when either (a) there is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2251 propagation data or (b) the end-of-line or end-of-buffer is hit.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2252
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2253 #### Also I think you need to ensure that the operation
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2254 "add begin glyphs; add end glyphs; add text" is atomic and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2255 can't get interrupted in the middle. If you run off the end
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2256 of the line during that operation, then you keep accumulating
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2257 propagation data until you're done. Otherwise, if the (e.g.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2258 there's a begin glyph at a particular position and attempting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2259 to display that glyph results in window-end being hit and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2260 propagation data being generated, then the character at that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2261 position won't be displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2262
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2263 #### See also the comment after the end of this loop, below.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2264 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2265 while (data.pixpos <= data.max_pixpos
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2266 && (active_minibuffer || !NILP (synch_minibuffers_value)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2267 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2268 /* #### This check probably should not be necessary. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2269 if (data.byte_charpos > BYTE_BUF_ZV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2270 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2271 /* #### urk! More of this lossage! */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2272 data.byte_charpos--;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2273 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2274 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2275
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2276 /* If selective display was an integer and we aren't working on
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2277 a continuation line then find the next line we are actually
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2278 supposed to display. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2279 if (selective > 0
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2280 && (data.byte_charpos == BYTE_BUF_BEGV (b)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2281 || BUF_FETCH_CHAR (b, prev_bytebpos (b, data.byte_charpos)) == '\n'))
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2282 {
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2283 while (byte_spaces_at_point (b, data.byte_charpos) >= selective)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2284 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2285 data.byte_charpos =
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2286 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2287 if (data.byte_charpos >= BYTE_BUF_ZV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2288 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2289 data.byte_charpos = BYTE_BUF_ZV (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2290 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2291 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2292 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2293 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2294
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2295 /* Check for face changes. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2296 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2297 {
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2298 Lisp_Object last_glyph = Qnil;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2299
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2300 /* Deal with glyphs that we have already displayed. The
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2301 theory is that if we end up with a PROP_GLYPH in the
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2302 propagation data then we are clipping the glyph and there
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2303 can be no propagation data before that point. The theory
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2304 works because we always recalculate the extent-fragments
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2305 for propagated data, we never actually propagate the
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2306 fragments that still need to be displayed. */
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2307 if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2308 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2309 last_glyph = Dynarr_atp (*prop, 0)->data.p_glyph.glyph;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2310 Dynarr_free (*prop);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2311 *prop = 0;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2312 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2313 /* Now compute the face and begin/end-glyph information. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2314 data.findex =
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
2315 /* Remember that the extent-fragment routines deal in Bytebpos's. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2316 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2317
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2318 get_display_tables (w, data.findex, &face_dt, &window_dt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2319
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2320 if (data.byte_charpos == data.ef->end)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2321 no_more_frags = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2322 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2323 initial = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2324
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2325 /* Determine what is next to be displayed. We first handle any
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2326 glyphs returned by glyphs_at_charbpos. If there are no glyphs to
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2327 display then we determine what to do based on the character at the
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2328 current buffer position. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2329
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2330 /* If the current position is covered by an invisible extent, do
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2331 nothing (except maybe add some ellipses).
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2332
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2333 #### The behavior of begin and end-glyphs at the edge of an
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2334 invisible extent should be investigated further. This is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2335 fairly low priority though. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2336 if (data.ef->invisible)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2337 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2338 /* #### Chuck, perhaps you could look at this code? I don't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2339 really know what I'm doing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2340 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2341 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2342 Dynarr_free (*prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2343 *prop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2344 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2345
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2346 /* The extent fragment code only sets this when we should
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2347 really display the ellipses. It makes sure the ellipses
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2348 don't get displayed more than once in a row. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2349 if (data.ef->invisible_ellipses)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2350 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2351 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2352
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2353 data.ef->invisible_ellipses_already_displayed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2354 data.ef->invisible_ellipses = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2355 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2356 gb.glyph = Vinvisible_text_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2357 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2358 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2359 /* Perhaps they shouldn't propagate if the very next thing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2360 is to display a newline (for compatibility with
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2361 selective-display-ellipses)? Maybe that's too
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2362 abstruse. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2363 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2364 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2365 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2366
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2367 /* If point is in an invisible region we place it on the
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2368 next visible character. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2369 if (data.cursor_type == CURSOR_ON
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2370 && data.byte_charpos == data.byte_cursor_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2371 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2372 data.cursor_type = NEXT_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2373 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2374
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2375 /* #### What if we we're dealing with a display table? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2376 if (data.start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2377 data.start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2378
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2379 if (data.byte_charpos == BYTE_BUF_ZV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2380 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2381 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2382 INC_BYTEBPOS (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2383 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2384
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2385 /* If there is propagation data, then it represents the current
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2386 buffer position being displayed. Add them and advance the
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2387 position counter. This might also add the minibuffer
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2388 prompt. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2389 else if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2390 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2391 dl->used_prop_data = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2392 *prop = add_propagation_runes (prop, &data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2393
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2394 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2395 goto done; /* gee, a really narrow window */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2396 else if (data.byte_charpos == BYTE_BUF_ZV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2397 goto done;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2398 else if (data.byte_charpos < BYTE_BUF_BEGV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2399 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2400 data.byte_charpos = BYTE_BUF_BEGV (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2401 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2402 INC_BYTEBPOS (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2403 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2404
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2405 /* If there are end glyphs, add them to the line. These are
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2406 the end glyphs for the previous run of text. We add them
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2407 here rather than doing them at the end of handling the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2408 previous run so that glyphs at the beginning and end of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2409 a line are handled correctly. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2410 else if (Dynarr_length (data.ef->end_glyphs) > 0
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2411 || Dynarr_length (data.ef->begin_glyphs) > 0)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2412 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2413 glyph_block_dynarr* tmpglyphs = 0;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2414 /* #### I think this is safe, but could be wrong. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2415 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2416
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2417 if (Dynarr_length (data.ef->end_glyphs) > 0)
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2418 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2419 *prop = add_glyph_runes (&data, END_GLYPHS);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2420 tmpglyphs = data.ef->end_glyphs;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2421 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2422
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2423 /* If there are begin glyphs, add them to the line. */
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2424 if (!*prop && Dynarr_length (data.ef->begin_glyphs) > 0)
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2425 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2426 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2427 tmpglyphs = data.ef->begin_glyphs;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2428 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2429
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2430 if (*prop)
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2431 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2432 /* If we just clipped a glyph and we are at the end of a
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2433 line and there are more glyphs to display then do
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2434 appropriate processing to not get a continuation
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2435 glyph. */
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2436 if (*prop != ADD_FAILED
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2437 && Dynarr_atp (*prop, 0)->type == PROP_GLYPH
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2438 && data.ch == '\n')
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2439 {
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2440 /* If there are no more glyphs then do the normal
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2441 processing.
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2442
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2443 #### This doesn't actually work if the same glyph is
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2444 present more than once in the block. To solve
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2445 this we would have to carry the index around
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2446 which might be problematic since the fragment is
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2447 recalculated for each line. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2448 if (EQ (Dynarr_end (tmpglyphs)->glyph,
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2449 Dynarr_atp (*prop, 0)->data.p_glyph.glyph))
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2450 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2451 Dynarr_free (*prop);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2452 *prop = 0;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2453 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2454 else {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2455 data.blank_width = DEVMETH (d, eol_cursor_width, ());
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2456 add_ichar_rune (&data); /* discard prop data. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2457 goto done;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2458 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2459 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2460 else
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2461 goto done;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2462 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2463 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2464
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2465 /* If at end-of-buffer, we've already processed begin and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2466 end-glyphs at this point and there's no text to process,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2467 so we're done. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2468 else if (data.byte_charpos == BYTE_BUF_ZV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2469 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2470
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2471 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2472 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2473 Lisp_Object entry = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2474 /* Get the character at the current buffer position. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2475 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2476 if (!NILP (face_dt) || !NILP (window_dt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2477 entry = display_table_entry (data.ch, face_dt, window_dt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2478
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2479 /* If there is a display table entry for it, hand it off to
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2480 add_disp_table_entry_runes and let it worry about it. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2481 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2482 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2483 *prop = add_disp_table_entry_runes (&data, entry);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2484
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2485 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2486 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2487 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2488
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2489 /* Check if we have hit a newline character. If so, add a marker
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2490 to the line and end this loop. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2491 else if (data.ch == '\n')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2492 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2493 /* We aren't going to be adding an end glyph so give its
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2494 space back in order to make sure that the cursor can
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2495 fit. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2496 data.max_pixpos += data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2497
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2498 if (selective > 0
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2499 && (byte_spaces_at_point
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2500 (b, next_bytebpos (b, data.byte_charpos))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2501 >= selective))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2502 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2503 if (!NILP (b->selective_display_ellipses))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2504 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2505 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2506
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2507 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2508 gb.glyph = Vinvisible_text_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2509 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2510 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2511 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2512 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2513 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2514 /* Cheesy, cheesy, cheesy. We mark the end of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2515 line with a special "character rune" whose width
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2516 is the EOL cursor width and whose character is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2517 the non-printing character '\n'. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2518 data.blank_width = DEVMETH (d, eol_cursor_width, ());
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2519 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2520 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2521
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2522 /* We need to set data.byte_charpos to the start of the
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2523 next visible region in order to make this line
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2524 appear to contain all of the invisible area.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2525 Otherwise, the line cache won't work
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2526 correctly. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2527 INC_BYTEBPOS (b, data.byte_charpos);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2528 while (byte_spaces_at_point (b, data.byte_charpos) >= selective)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2529 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2530 data.byte_charpos =
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2531 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2532 if (data.byte_charpos >= BYTE_BUF_ZV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2533 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2534 data.byte_charpos = BYTE_BUF_ZV (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2535 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2536 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2537 }
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2538 if (BYTE_BUF_FETCH_CHAR
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2539 (b, prev_bytebpos (b, data.byte_charpos)) == '\n')
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2540 DEC_BYTEBPOS (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2541 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2542 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2543 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2544 data.blank_width = DEVMETH (d, eol_cursor_width, ());
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2545 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2546 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2547
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2548 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2549 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2550
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2551 /* If the current character is ^M, and selective display is
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2552 enabled, then add the invisible-text-glyph if
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2553 selective-display-ellipses is set. In any case, this
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2554 line is done. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2555 else if (data.ch == (('M' & 037)) && selective == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2556 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2557 Bytebpos byte_next_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2558
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2559 /* Find the buffer position at the end of the line. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2560 byte_next_charpos =
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2561 byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2562 if (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_next_charpos))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2563 == '\n')
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2564 DEC_BYTEBPOS (b, byte_next_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2565
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2566 /* If the cursor is somewhere in the elided text make
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2567 sure that the cursor gets drawn appropriately. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2568 if (data.cursor_type == CURSOR_ON
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2569 && (data.byte_cursor_charpos >= data.byte_charpos &&
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2570 data.byte_cursor_charpos < byte_next_charpos))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2571 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2572 data.cursor_type = NEXT_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2573 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2574
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2575 /* We won't be adding a truncation or continuation glyph
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2576 so give up the room allocated for them. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2577 data.max_pixpos += data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2578
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2579 if (!NILP (b->selective_display_ellipses))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2580 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2581 /* We don't propagate anything from the invisible
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2582 text glyph if it fails to fit. This is
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2583 intentional. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2584 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2585
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2586 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2587 gb.glyph = Vinvisible_text_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2588 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2589 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2590 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2591
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2592 /* Set the buffer position to the end of the line. We
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2593 need to do this before potentially adding a newline
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2594 so that the cursor flag will get set correctly (if
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2595 needed). */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2596 data.byte_charpos = byte_next_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2597
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2598 if (NILP (b->selective_display_ellipses)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2599 || data.byte_cursor_charpos == byte_next_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2600 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2601 /* We have to at least add a newline character so
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2602 that the cursor shows up properly. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2603 data.ch = '\n';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2604 data.blank_width = DEVMETH (d, eol_cursor_width, ());
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2605 data.findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2606 data.start_col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2607 data.start_col_xoffset = 0;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2608 data.byte_start_col_enabled = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2609
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2610 add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2611 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2612
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2613 /* This had better be a newline but doing it this way
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2614 we'll see obvious incorrect results if it isn't. No
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2615 need to abort here. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2616 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2617
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2618 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2619 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2620
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2621 /* If the current character is considered to be printable, then
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2622 just add it. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2623 else if (data.ch >= printable_min)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2624 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2625 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2626 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2627 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2628 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2629
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2630 /* If the current character is a tab, determine the next tab
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2631 starting position and add a blank rune which extends from the
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2632 current pixel position to that starting position. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2633 else if (data.ch == '\t')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2634 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2635 int tab_start_pixpos = data.pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2636 int next_tab_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2637 int char_tab_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2638 int prop_width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2639
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2640 if (data.start_col > 1)
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
2641 tab_start_pixpos -= (space_width (w) * (data.start_col - 1))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2642 + data.start_col_xoffset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2643
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2644 next_tab_start =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2645 next_tab_position (w, tab_start_pixpos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2646 dl->bounds.left_in +
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2647 data.hscroll_glyph_width_adjust);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2648 if (next_tab_start > data.max_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2649 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2650 prop_width = next_tab_start - data.max_pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2651 next_tab_start = data.max_pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2652 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2653 data.blank_width = next_tab_start - data.pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2654 char_tab_width =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2655 (next_tab_start - tab_start_pixpos) / space_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2656
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2657 *prop = add_blank_rune (&data, w, char_tab_width);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2658
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2659 /* add_blank_rune is only supposed to be called with
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2660 sizes guaranteed to fit in the available space. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2661 assert (!(*prop));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2662
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2663 if (prop_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2664 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2665 struct prop_block pb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2666 *prop = Dynarr_new (prop_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2667
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2668 pb.type = PROP_BLANK;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2669 pb.data.p_blank.width = prop_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2670 pb.data.p_blank.findex = data.findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2671 Dynarr_add (*prop, pb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2672
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2673 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2674 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2675 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2676
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2677 /* If character is a control character, pass it off to
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2678 add_control_char_runes.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2679
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2680 The is_*() routines have undefined results on
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2681 arguments outside of the range [-1, 255]. (This
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2682 often bites people who carelessly use `char' instead
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2683 of `unsigned char'.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2684 */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2685 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2686 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2687 *prop = add_control_char_runes (&data, b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2688
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2689 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2690 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2691 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2692
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2693 /* If the character is above the ASCII range and we have not
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2694 already handled it, then print it as an octal number. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2695 else if (data.ch >= 0200)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2696 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2697 *prop = add_octal_runes (&data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2698
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2699 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2700 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2701 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2702
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2703 /* Assume the current character is considered to be printable,
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2704 then just add it. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2705 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2706 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2707 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2708 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2709 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2710 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2711
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2712 INC_BYTEBPOS (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2713 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2714 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2715
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2716 done:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2717
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2718 /* Determine the starting point of the next line if we did not hit the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2719 end of the buffer. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2720 if (data.byte_charpos < BYTE_BUF_ZV (b)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2721 && (active_minibuffer || !NILP (synch_minibuffers_value)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2722 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2723 /* #### This check is not correct. If the line terminated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2724 due to a begin-glyph or end-glyph hitting window-end, then
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2725 data.ch will not point to the character at data.byte_charpos. If
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2726 you make the two changes mentioned at the top of this loop,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2727 you should be able to say '(if (*prop))'. That should also
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2728 make it possible to eliminate the data.byte_charpos < BYTE_BUF_ZV (b)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2729 check. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2730
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2731 /* The common case is that the line ended because we hit a newline.
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2732 In that case, the next character is just the next buffer
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2733 position. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2734 if (data.ch == '\n')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2735 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2736 /* If data.start_col_enabled is still true, then the window is
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2737 scrolled far enough so that nothing on this line is visible.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2738 We need to stick a truncation glyph at the beginning of the
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2739 line in that case unless the line is completely blank. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2740 if (data.byte_start_col_enabled)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2741 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2742 if (data.cursor_type == CURSOR_ON)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2743 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2744 if (data.byte_cursor_charpos >= byte_start_pos
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2745 && data.byte_cursor_charpos <= data.byte_charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2746 data.byte_cursor_charpos = data.byte_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2747 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2748 data.findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2749 data.start_col = 0;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2750 data.byte_start_col_enabled = 0;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2751
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2752 if (data.byte_charpos != byte_start_pos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2753 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2754 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2755
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2756 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2757 gb.glyph = Vhscroll_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2758 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2759 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2760 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2761 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2762 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2763 /* This duplicates code down below to add a newline to
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2764 the end of an otherwise empty line.*/
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2765 data.ch = '\n';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2766 data.blank_width = DEVMETH (d, eol_cursor_width, ());
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2767
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2768 add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2769 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2770 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2771
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2772 INC_BYTEBPOS (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2773 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2774
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2775 /* Otherwise we have a buffer line which cannot fit on one display
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2776 line. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2777 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2778 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2779 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2780 struct glyph_cachel *cachel;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2781
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2782 /* If the line is to be truncated then we actually have to look
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2783 for the next newline. We also add the end-of-line glyph which
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2784 we know will fit because we adjusted the right border before
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2785 we starting laying out the line. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2786 data.max_pixpos += data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2787 data.findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2788 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2789
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2790 if (truncate_win)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2791 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2792 Bytebpos byte_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2793
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2794 /* Now find the start of the next line. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2795 byte_pos = byte_find_next_newline_no_quit (b, data.byte_charpos, 1);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2796
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2797 /* If the cursor is past the truncation line then we
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2798 make it appear on the truncation glyph. If we've hit
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2799 the end of the buffer then we also make the cursor
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2800 appear unless eob is immediately preceded by a
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2801 newline. In that case the cursor should actually
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2802 appear on the next line. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2803 if (data.cursor_type == CURSOR_ON
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2804 && data.byte_cursor_charpos >= data.byte_charpos
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2805 && (data.byte_cursor_charpos < byte_pos ||
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2806 (byte_pos == BYTE_BUF_ZV (b)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2807 && (byte_pos == BYTE_BUF_BEGV (b)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2808 || (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_pos))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2809 != '\n')))))
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2810 data.byte_cursor_charpos = byte_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2811 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2812 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2813
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2814 data.byte_charpos = byte_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2815 gb.glyph = Vtruncation_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2816 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2817 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2818 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2819 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2820 /* The cursor can never be on the continuation glyph. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2821 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2822
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2823 /* data.byte_charpos is already at the start of the next line. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2824
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2825 dl->line_continuation = 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2826 gb.glyph = Vcontinuation_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2827 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2828 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2829
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2830 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2831
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2832 if (truncate_win && data.byte_charpos == BYTE_BUF_ZV (b)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2833 && BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, BYTE_BUF_ZV (b))) != '\n')
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2834 /* #### Damn this losing shit. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2835 data.byte_charpos++;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2836 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2837 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2838 else if ((active_minibuffer || !NILP (synch_minibuffers_value))
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2839 && (!echo_area_active (f) || data.byte_charpos == BYTE_BUF_ZV (b)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2840 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2841 /* We need to add a marker to the end of the line since there is no
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2842 newline character in order for the cursor to get drawn. We label
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2843 it as a newline so that it gets handled correctly by the
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2844 whitespace routines below. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2845
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2846 data.ch = '\n';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2847 data.blank_width = DEVMETH (d, eol_cursor_width, ());
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2848 data.findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2849 data.start_col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2850 data.start_col_xoffset = 0;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2851 data.byte_start_col_enabled = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2852
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2853 data.max_pixpos += data.blank_width;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2854 add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2855 data.max_pixpos -= data.blank_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2856
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2857 /* #### urk! Chuck, this shit is bad news. Going around
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2858 manipulating invalid positions is guaranteed to result in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2859 trouble sooner or later. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2860 data.byte_charpos = BYTE_BUF_ZV (b) + 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2861 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2862
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2863 /* Calculate left whitespace boundary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2864 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2865 int elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2866
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2867 /* Whitespace past a newline is considered right whitespace. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2868 while (elt < Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2869 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2870 struct rune *rb = Dynarr_atp (db->runes, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2871
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2872 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2873 || rb->type == RUNE_BLANK)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2874 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2875 dl->bounds.left_white += rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2876 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2877 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2878 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2879 elt = Dynarr_length (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2880 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2881 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2882
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2883 /* Calculate right whitespace boundary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2884 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2885 int elt = Dynarr_length (db->runes) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2886 int done = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2887
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2888 while (!done && elt >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2889 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2890 struct rune *rb = Dynarr_atp (db->runes, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2891
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2892 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2893 && isspace (rb->object.chr.ch))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2894 && !rb->type == RUNE_BLANK)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2895 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2896 dl->bounds.right_white = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2897 done = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2898 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2899
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2900 elt--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2901
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2902 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2903
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2904 /* The line is blank so everything is considered to be right
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2905 whitespace. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2906 if (!done)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2907 dl->bounds.right_white = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2908 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2909
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2910 /* Set the display blocks bounds. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2911 db->start_pos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2912 if (Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2913 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2914 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2915
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2916 db->end_pos = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2917 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2918 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2919 db->end_pos = dl->bounds.right_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2920
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2921 calculate_baseline (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2922
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2923 dl->ascent = data.new_ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2924 dl->descent = data.new_descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2925
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2926 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2927 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2928
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2929 if (dl->ascent < ascent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2930 dl->ascent = ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2931 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2932 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2933 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2934
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2935 if (dl->descent < descent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2936 dl->descent = descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2937 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2938
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2939 calculate_yoffset (dl, db);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2940
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2941 dl->cursor_elt = data.cursor_x;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2942 /* #### lossage lossage lossage! Fix this shit! */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2943 if (data.byte_charpos > BYTE_BUF_ZV (b))
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2944 dl->end_charpos = BUF_ZV (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2945 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2946 dl->end_charpos = bytebpos_to_charbpos (b, data.byte_charpos) - 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2947 if (truncate_win)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2948 data.dl->num_chars = column_at_point (b, dl->end_charpos, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2949 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2950 /* This doesn't correctly take into account tabs and control
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2951 characters but if the window isn't being truncated then this
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2952 value isn't going to end up being used anyhow. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2953 data.dl->num_chars = dl->end_charpos - dl->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2954
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2955 /* #### handle horizontally scrolled line with text none of which
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2956 was actually laid out. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2957
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2958 /* #### handle any remainder of overlay arrow */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2959
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2960 if (*prop == ADD_FAILED)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2961 *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2962
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2963 if (truncate_win && *prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2964 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2965 Dynarr_free (*prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2966 *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2967 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2968
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2969 extent_fragment_delete (data.ef);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2970
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2971 /* #### If we started at EOB, then make sure we return a value past
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2972 it so that regenerate_window will exit properly. This is bogus.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2973 The main loop should get fixed so that it isn't necessary to call
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2974 this function if we are already at EOB. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2975
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2976 if (data.byte_charpos == BYTE_BUF_ZV (b) && byte_start_pos == BYTE_BUF_ZV (b))
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2977 return data.byte_charpos + 1; /* Yuck! */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2978 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2979 return data.byte_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2980 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2981
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2982 /* Display the overlay arrow at the beginning of the given line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2983
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2984 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2985 create_overlay_glyph_block (struct window *w, struct display_line *dl)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2986 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2987 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2988 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2989 pos_data data;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2990
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2991 /* If Voverlay_arrow_string isn't valid then just fail silently. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2992 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2993 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2994
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2995 xzero (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2996 data.ef = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2997 data.d = d;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
2998 data.window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2999 data.db = get_display_block_from_line (dl, OVERWRITE);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3000 data.dl = dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3001 data.pixpos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3002 data.max_pixpos = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3003 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3004 data.cursor_x = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3005 data.findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3006 data.last_charset = Qunbound;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3007 data.last_findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3008 data.result_str = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3009 data.string = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3010
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3011 Dynarr_reset (data.db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3012
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3013 if (STRINGP (Voverlay_arrow_string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3014 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
3015 add_ibyte_string_runes
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3016 (&data,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3017 XSTRING_DATA (Voverlay_arrow_string),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3018 XSTRING_LENGTH (Voverlay_arrow_string),
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3019 1, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3020 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3021 else if (GLYPHP (Voverlay_arrow_string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3022 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3023 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3024
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3025 gb.glyph = Voverlay_arrow_string;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3026 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3027 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3028 }
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3029
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3030 if (data.max_pixmap_height)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3031 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3032 int height = data.new_ascent + data.new_descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3033 int pix_ascent, pix_descent;
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3034
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3035 pix_descent = data.max_pixmap_height * data.new_descent / height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3036 pix_ascent = data.max_pixmap_height - pix_descent;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3037 calculate_baseline (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3038
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3039 data.new_ascent = max (data.new_ascent, pix_ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3040 data.new_descent = max (data.new_descent, pix_descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3041 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3042
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3043 dl->ascent = data.new_ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3044 dl->descent = data.new_descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3045
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3046 data.db->start_pos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3047 data.db->end_pos = data.pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3048
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3049 calculate_yoffset (dl, data.db);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3050
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3051 return data.pixpos - dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3052 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3053
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3054 /* Add a type of glyph to a margin display block. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3055
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3056 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3057 add_margin_runes (struct display_line *dl, struct display_block *db, int start,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3058 int count, enum glyph_layout layout, int side, Lisp_Object window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3059 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3060 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3061 ? dl->left_glyphs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3062 : dl->right_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3063 int elt, end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3064 int reverse;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3065 struct window *w = XWINDOW (window);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3066 struct frame *f = XFRAME (w->frame);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3067 struct device *d = XDEVICE (f->device);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3068 pos_data data;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3069
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3070 xzero (data);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3071 data.d = d;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3072 data.window = window;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3073 data.db = db;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3074 data.dl = dl;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3075 data.pixpos = start;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3076 data.cursor_type = NO_CURSOR;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3077 data.cursor_x = -1;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3078 data.last_charset = Qunbound;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3079 data.last_findex = DEFAULT_INDEX;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3080 data.result_str = Qnil;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3081 data.string = Qnil;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3082 data.new_ascent = dl->ascent;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3083 data.new_descent = dl->descent;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3084
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3085 if ((layout == GL_WHITESPACE && side == LEFT_GLYPHS)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3086 || (layout == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3087 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3088 reverse = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3089 elt = Dynarr_length (gbd) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3090 end = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3091 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3092 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3093 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3094 reverse = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3095 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3096 end = Dynarr_length (gbd);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3097 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3098
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3099 while (count && ((!reverse && elt < end) || (reverse && elt >= end)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3100 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3101 struct glyph_block *gb = Dynarr_atp (gbd, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3102
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3103 if (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3104 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3105
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3106 if (gb->active &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3107 ((side == LEFT_GLYPHS &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3108 extent_begin_glyph_layout (XEXTENT (gb->extent)) == layout)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3109 || (side == RIGHT_GLYPHS &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3110 extent_end_glyph_layout (XEXTENT (gb->extent)) == layout)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3111 {
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3112 data.findex = gb->findex;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3113 data.max_pixpos = data.pixpos + gb->width;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3114 add_glyph_rune (&data, gb, side, 0, NULL);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3115 count--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3116 gb->active = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3117 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3118
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3119 (reverse ? elt-- : elt++);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3120 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3121
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3122 calculate_baseline (&data);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3123
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3124 dl->ascent = data.new_ascent;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3125 dl->descent = data.new_descent;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3126
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3127 calculate_yoffset (dl, data.db);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3128
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3129 return data.pixpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3130 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3131
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3132 /* Add a blank to a margin display block. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3133
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3134 static void
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
3135 add_margin_blank (struct display_line *UNUSED (dl), struct display_block *db,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3136 struct window *w, int xpos, int width, int side)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3137 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3138 struct rune rb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3139
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3140 rb.findex = (side == LEFT_GLYPHS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3141 ? get_builtin_face_cache_index (w, Vleft_margin_face)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3142 : get_builtin_face_cache_index (w, Vright_margin_face));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3143 rb.xpos = xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3144 rb.width = width;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
3145 rb.charpos = -1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3146 rb.endpos = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3147 rb.type = RUNE_BLANK;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3148 rb.cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3149
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3150 Dynarr_add (db->runes, rb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3151 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3152
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3153 /* Display glyphs in the left outside margin, left inside margin and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3154 left whitespace area. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3155
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3156 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3157 create_left_glyph_block (struct window *w, struct display_line *dl,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3158 int overlay_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3159 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3160 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3161
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3162 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3163 int elt, end_xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3164 int out_end, in_out_start, in_in_end, white_out_start, white_in_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3165 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3166 int left_in_start = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3167 int left_in_end = dl->bounds.left_in + overlay_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3168
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3169 struct display_block *odb, *idb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3170
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3171 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3172
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3173 /* We have to add the glyphs to the line in the order outside,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3174 inside, whitespace. However the precedence dictates that we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3175 determine how many will fit in the reverse order. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3176
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3177 /* Determine how many whitespace glyphs we can display and where
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3178 they should start. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3179 white_in_start = dl->bounds.left_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3180 white_out_start = left_in_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3181 white_out_cnt = white_in_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3182 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3183
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3184 while (elt < Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3185 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3186 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3187
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3188 if (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3189 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3190
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3191 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3192 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3193 int width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3194
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3195 width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3196
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3197 if (white_in_start - width >= left_in_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3198 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3199 white_in_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3200 white_in_start -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3201 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3202 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3203 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3204 else if (use_overflow
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3205 && (white_out_start - width > dl->bounds.left_out))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3206 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3207 white_out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3208 white_out_start -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3209 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3210 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3211 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3212 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3213 gb->active = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3214 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3215
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3216 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3217 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3218
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3219 /* Determine how many inside margin glyphs we can display and where
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3220 they should start. The inside margin glyphs get whatever space
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3221 is left after the whitespace glyphs have been displayed. These
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3222 are tricky to calculate since if we decide to use the overflow
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3223 area we basically have to start over. So for these we build up a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3224 list of just the inside margin glyphs and manipulate it to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3225 determine the needed info. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3226 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3227 glyph_block_dynarr *ib;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3228 int avail_in, avail_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3229 int done = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3230 int marker = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3231 int used_in, used_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3232
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3233 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3234 used_in = used_out = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3235 ib = Dynarr_new (glyph_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3236 while (elt < Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3237 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3238 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3239
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3240 if (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3241 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3242
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3243 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3244 GL_INSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3245 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3246 gb->width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3247 used_in += gb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3248 Dynarr_add (ib, *gb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3249 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3250
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3251 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3252 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3253
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3254 if (white_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3255 avail_in = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3256 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3257 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3258 avail_in = white_in_start - left_in_end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3259 if (avail_in < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3260 avail_in = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3261 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3262
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3263 if (!use_overflow)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3264 avail_out = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3265 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3266 avail_out = white_out_start - dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3267
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3268 marker = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3269 while (!done && marker < Dynarr_length (ib))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3270 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3271 int width = Dynarr_atp (ib, marker)->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3272
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3273 /* If everything now fits in the available inside margin
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3274 space, we're done. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3275 if (used_in <= avail_in)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3276 done = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3277 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3278 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3279 /* Otherwise see if we have room to move a glyph to the
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3280 outside. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3281 if (used_out + width <= avail_out)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3282 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3283 used_out += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3284 used_in -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3285 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3286 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3287 done = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3288 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3289
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3290 if (!done)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3291 marker++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3292 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3293
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3294 /* At this point we now know that everything from marker on goes in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3295 the inside margin and everything before it goes in the outside
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3296 margin. The stuff going into the outside margin is guaranteed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3297 to fit, but we may have to trim some stuff from the inside. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3298
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3299 in_in_end = left_in_end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3300 in_out_start = white_out_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3301 in_out_cnt = in_in_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3302
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3303 Dynarr_free (ib);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3304 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3305 while (elt < Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3306 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3307 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3308
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3309 if (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3310 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3311
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3312 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3313 GL_INSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3314 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3315 int width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3316
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3317 if (used_out)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3318 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3319 in_out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3320 in_out_start -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3321 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3322 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3323 used_out -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3324 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3325 else if (in_in_end + width < white_in_start)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3326 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3327 in_in_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3328 in_in_end += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3329 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3330 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3331 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3332 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3333 gb->active = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3334 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3335
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3336 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3337 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3338 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3339
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3340 /* Determine how many outside margin glyphs we can display. They
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3341 always start at the left outside margin and can only use the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3342 outside margin space. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3343 out_end = dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3344 out_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3345 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3346
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3347 while (elt < Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3348 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3349 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3350
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3351 if (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3352 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3353
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3354 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3355 GL_OUTSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3356 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3357 int width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3358
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3359 if (out_end + width <= in_out_start)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3360 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3361 out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3362 out_end += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3363 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3364 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3365 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3366 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3367 gb->active = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3368 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3369
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3370 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3371 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3372
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3373 /* Now that we know where everything goes, we add the glyphs as
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3374 runes to the appropriate display blocks. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3375 if (out_cnt || in_out_cnt || white_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3376 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3377 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3378 odb->start_pos = dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3379 /* #### We should stop adding a blank to account for the space
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3380 between the end of the glyphs and the margin and instead set
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3381 this accordingly. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3382 odb->end_pos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3383 Dynarr_reset (odb->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3384 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3385 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3386 odb = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3387
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3388 if (in_in_cnt || white_in_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3389 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3390 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3391 idb->start_pos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3392 /* #### See above comment for odb->end_pos */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3393 idb->end_pos = dl->bounds.left_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3394 Dynarr_reset (idb->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3395 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3396 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3397 idb = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3398
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3399 /* First add the outside margin glyphs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3400 if (out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3401 end_xpos = add_margin_runes (dl, odb, dl->bounds.left_out, out_cnt,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3402 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3403 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3404 end_xpos = dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3405
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3406 /* There may be blank space between the outside margin glyphs and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3407 the inside margin glyphs. If so, add a blank. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3408 if (in_out_cnt && (in_out_start - end_xpos))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3409 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3410 add_margin_blank (dl, odb, w, end_xpos, in_out_start - end_xpos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3411 LEFT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3412 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3413
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3414 /* Next add the inside margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3415 outside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3416 if (in_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3417 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3418 end_xpos = add_margin_runes (dl, odb, in_out_start, in_out_cnt,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3419 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3420 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3421
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3422 /* If we didn't add any inside margin glyphs to the outside margin,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3423 but are adding whitespace glyphs, then we need to add a blank
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3424 here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3425 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3426 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3427 add_margin_blank (dl, odb, w, end_xpos, white_out_start - end_xpos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3428 LEFT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3429 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3430
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3431 /* Next add the whitespace margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3432 outside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3433 if (white_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3434 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3435 end_xpos = add_margin_runes (dl, odb, white_out_start, white_out_cnt,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3436 GL_WHITESPACE, LEFT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3437 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3438
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3439 /* We take care of clearing between the end of the glyphs and the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3440 start of the inside margin for lines which have glyphs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3441 if (odb && (left_in_start - end_xpos))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3442 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3443 add_margin_blank (dl, odb, w, end_xpos, left_in_start - end_xpos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3444 LEFT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3445 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3446
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3447 /* Next add the inside margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3448 inside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3449 if (in_in_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3450 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3451 end_xpos = add_margin_runes (dl, idb, left_in_end, in_in_cnt,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3452 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3453 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3454 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3455 end_xpos = left_in_end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3456
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3457 /* Make sure that the area between the end of the inside margin
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3458 glyphs and the whitespace glyphs is cleared. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3459 if (idb && (white_in_start - end_xpos > 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3460 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3461 add_margin_blank (dl, idb, w, end_xpos, white_in_start - end_xpos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3462 LEFT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3463 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3464
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3465 /* Next add the whitespace margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3466 inside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3467 if (white_in_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3468 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3469 add_margin_runes (dl, idb, white_in_start, white_in_cnt, GL_WHITESPACE,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3470 LEFT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3471 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3472
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3473 /* Whitespace glyphs always end right next to the text block so
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3474 there is nothing we have to make sure is cleared after them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3475 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3476
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3477 /* Display glyphs in the right outside margin, right inside margin and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3478 right whitespace area. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3479
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3480 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3481 create_right_glyph_block (struct window *w, struct display_line *dl)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3482 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3483 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3484
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3485 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3486 int elt, end_xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3487 int out_start, in_out_end, in_in_start, white_out_end, white_in_end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3488 int out_cnt, in_out_cnt, in_in_cnt, white_out_cnt, white_in_cnt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3489
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3490 struct display_block *odb, *idb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3491
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3492 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3493
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3494 /* We have to add the glyphs to the line in the order outside,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3495 inside, whitespace. However the precedence dictates that we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3496 determine how many will fit in the reverse order. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3497
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3498 /* Determine how many whitespace glyphs we can display and where
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3499 they should start. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3500 white_in_end = dl->bounds.right_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3501 white_out_end = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3502 white_out_cnt = white_in_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3503 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3504
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3505 while (elt < Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3506 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3507 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3508
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3509 if (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3510 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3511
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3512 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3513 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3514 int width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3515
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3516 if (white_in_end + width <= dl->bounds.right_in)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3517 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3518 white_in_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3519 white_in_end += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3520 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3521 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3522 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3523 else if (use_overflow
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3524 && (white_out_end + width <= dl->bounds.right_out))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3525 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3526 white_out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3527 white_out_end += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3528 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3529 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3530 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3531 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3532 gb->active = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3533 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3534
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3535 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3536 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3537
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3538 /* Determine how many inside margin glyphs we can display and where
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3539 they should start. The inside margin glyphs get whatever space
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3540 is left after the whitespace glyphs have been displayed. These
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3541 are tricky to calculate since if we decide to use the overflow
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3542 area we basically have to start over. So for these we build up a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3543 list of just the inside margin glyphs and manipulate it to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3544 determine the needed info. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3545 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3546 glyph_block_dynarr *ib;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3547 int avail_in, avail_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3548 int done = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3549 int marker = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3550 int used_in, used_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3551
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3552 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3553 used_in = used_out = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3554 ib = Dynarr_new (glyph_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3555 while (elt < Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3556 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3557 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3558
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3559 if (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3560 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3561
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3562 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3563 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3564 gb->width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3565 used_in += gb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3566 Dynarr_add (ib, *gb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3567 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3568
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3569 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3570 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3571
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3572 if (white_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3573 avail_in = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3574 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3575 avail_in = dl->bounds.right_in - white_in_end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3576
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3577 if (!use_overflow)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3578 avail_out = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3579 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3580 avail_out = dl->bounds.right_out - white_out_end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3581
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3582 marker = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3583 while (!done && marker < Dynarr_length (ib))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3584 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3585 int width = Dynarr_atp (ib, marker)->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3586
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3587 /* If everything now fits in the available inside margin
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3588 space, we're done. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3589 if (used_in <= avail_in)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3590 done = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3591 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3592 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3593 /* Otherwise see if we have room to move a glyph to the
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3594 outside. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3595 if (used_out + width <= avail_out)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3596 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3597 used_out += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3598 used_in -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3599 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3600 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3601 done = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3602 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3603
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3604 if (!done)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3605 marker++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3606 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3607
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3608 /* At this point we now know that everything from marker on goes in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3609 the inside margin and everything before it goes in the outside
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3610 margin. The stuff going into the outside margin is guaranteed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3611 to fit, but we may have to trim some stuff from the inside. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3612
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3613 in_in_start = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3614 in_out_end = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3615 in_out_cnt = in_in_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3616
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3617 Dynarr_free (ib);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3618 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3619 while (elt < Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3620 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3621 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3622
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3623 if (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3624 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3625
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3626 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3627 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3628 int width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3629
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3630 if (used_out)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3631 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3632 in_out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3633 in_out_end += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3634 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3635 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3636 used_out -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3637 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3638 else if (in_in_start - width >= white_in_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3639 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3640 in_in_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3641 in_in_start -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3642 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3643 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3644 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3645 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3646 gb->active = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3647 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3648
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3649 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3650 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3651 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3652
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3653 /* Determine how many outside margin glyphs we can display. They
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3654 always start at the right outside margin and can only use the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3655 outside margin space. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3656 out_start = dl->bounds.right_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3657 out_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3658 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3659
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3660 while (elt < Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3661 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3662 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3663
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3664 if (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3665 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3666
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3667 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3668 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3669 int width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3670
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3671 if (out_start - width >= in_out_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3672 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3673 out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3674 out_start -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3675 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3676 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3677 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3678 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3679 gb->active = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3680 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3681
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3682 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3683 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3684
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3685 /* Now that we now where everything goes, we add the glyphs as runes
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3686 to the appropriate display blocks. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3687 if (out_cnt || in_out_cnt || white_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3688 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3689 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3690 /* #### See comments before odb->start_pos init in
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3691 create_left_glyph_block */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3692 odb->start_pos = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3693 odb->end_pos = dl->bounds.right_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3694 Dynarr_reset (odb->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3695 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3696 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3697 odb = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3698
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3699 if (in_in_cnt || white_in_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3700 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3701 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3702 idb->start_pos = dl->bounds.right_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3703 /* #### See comments before odb->start_pos init in
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3704 create_left_glyph_block */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3705 idb->end_pos = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3706 Dynarr_reset (idb->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3707 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3708 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3709 idb = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3710
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3711 /* First add the whitespace margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3712 inside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3713 if (white_in_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3714 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3715 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3716 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3717 window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3718 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3719 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3720 end_xpos = dl->bounds.right_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3721
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3722 /* Make sure that the area between the end of the whitespace glyphs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3723 and the inside margin glyphs is cleared. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3724 if (in_in_cnt && (in_in_start - end_xpos))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3725 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3726 add_margin_blank (dl, idb, w, end_xpos, in_in_start - end_xpos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3727 RIGHT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3728 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3729
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3730 /* Next add the inside margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3731 inside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3732 if (in_in_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3733 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3734 end_xpos = add_margin_runes (dl, idb, in_in_start, in_in_cnt,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3735 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3736 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3737
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3738 /* If we didn't add any inside margin glyphs then make sure the rest
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3739 of the inside margin area gets cleared. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3740 if (idb && (dl->bounds.right_in - end_xpos))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3741 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3742 add_margin_blank (dl, idb, w, end_xpos, dl->bounds.right_in - end_xpos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3743 RIGHT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3744 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3745
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3746 /* Next add any whitespace glyphs in the outside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3747 if (white_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3748 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3749 end_xpos = add_margin_runes (dl, odb, dl->bounds.right_in, white_out_cnt,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3750 GL_WHITESPACE, RIGHT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3751 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3752 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3753 end_xpos = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3754
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3755 /* Next add any inside margin glyphs in the outside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3756 if (in_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3757 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3758 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3759 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3760 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3761
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3762 /* There may be space between any whitespace or inside margin glyphs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3763 in the outside margin and the actual outside margin glyphs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3764 if (odb && (out_start - end_xpos))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3765 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3766 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3767 RIGHT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3768 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3769
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3770 /* Finally, add the outside margin glyphs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3771 if (out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3772 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3773 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3774 RIGHT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3775 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3776 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3777
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3778
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3779 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3780 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3781 /* modeline routines */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3782 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3783 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3784
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3785 /* This function is also used in frame.c by `generate_title_string' */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3786 void
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3787 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str,
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3788 struct window *w, struct display_line *dl,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3789 struct display_block *db, face_index findex,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3790 int min_pixpos, int max_pixpos, int type)
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3791 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3792 struct frame *f = XFRAME (w->frame);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3793 struct device *d = XDEVICE (f->device);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3794
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3795 pos_data data;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3796 int c_pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3797 Charcount offset = 0;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3798
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3799 xzero (data);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3800 data.d = d;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3801 data.db = db;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3802 data.dl = dl;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3803 data.findex = findex;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3804 data.pixpos = min_pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3805 data.max_pixpos = max_pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3806 data.cursor_type = NO_CURSOR;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3807 data.last_charset = Qunbound;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3808 data.last_findex = DEFAULT_INDEX;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3809 data.result_str = result_str;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3810 data.is_modeline = 1;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3811 data.string = Qnil;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3812 data.window = wrap_window (w);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3813
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3814 Dynarr_reset (formatted_string_extent_dynarr);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3815 Dynarr_reset (formatted_string_extent_start_dynarr);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3816 Dynarr_reset (formatted_string_extent_end_dynarr);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3817
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3818 /* result_str is nil when we're building a frame or icon title. Otherwise,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3819 we're building a modeline, so the offset starts at the modeline
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3820 horizontal scrolling amount */
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3821 if (! NILP (result_str))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3822 offset = w->modeline_hscroll;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3823 generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0,
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3824 max_pixpos - min_pixpos, findex, type, &offset,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3825 Qnil);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3826
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3827 if (Dynarr_length (db->runes))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3828 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3829 struct rune *rb =
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3830 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3831 c_pixpos = rb->xpos + rb->width;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3832 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3833 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3834 c_pixpos = min_pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3835
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3836 /* If we don't reach the right side of the window, add a blank rune
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3837 to make up the difference. This usually only occurs if the
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3838 modeline face is using a proportional width font or a fixed width
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3839 font of a different size from the default face font. */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3840
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3841 if (c_pixpos < max_pixpos)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3842 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3843 data.pixpos = c_pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3844 data.blank_width = max_pixpos - data.pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3845
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3846 add_blank_rune (&data, NULL, 0);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3847 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3848
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3849 /* Now create the result string and frob the extents into it. */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3850 if (!NILP (result_str))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3851 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3852 int elt;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3853 Bytecount len;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
3854 Ibyte *strdata;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3855 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3856
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3857 in_modeline_generation = 1;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3858
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
3859 sledgehammer_check_ascii_begin (result_str);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3860 detach_all_extents (result_str);
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3861 resize_string (result_str, -1,
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3862 data.bytepos - XSTRING_LENGTH (result_str));
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3863
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3864 strdata = XSTRING_DATA (result_str);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3865
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3866 for (elt = 0, len = 0; elt < Dynarr_length (db->runes); elt++)
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3867 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3868 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3869 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3870 len += (set_itext_ichar
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3871 (strdata + len, Dynarr_atp (db->runes,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3872 elt)->object.chr.ch));
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3873 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3874 }
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3875
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
3876 init_string_ascii_begin (result_str);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
3877 bump_string_modiff (result_str);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
3878 sledgehammer_check_ascii_begin (result_str);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
3879
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3880 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr);
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3881 elt++)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3882 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3883 Lisp_Object extent = Qnil;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3884 Lisp_Object child;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3885
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3886 extent = wrap_extent (Dynarr_at (formatted_string_extent_dynarr, elt));
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3887 child = Fgethash (extent, buf->modeline_extent_table, Qnil);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3888 if (NILP (child))
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3889 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3890 child = Fmake_extent (Qnil, Qnil, result_str);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3891 Fputhash (extent, child, buf->modeline_extent_table);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3892 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3893 Fset_extent_parent (child, extent);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3894 set_extent_endpoints
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3895 (XEXTENT (child),
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3896 Dynarr_at (formatted_string_extent_start_dynarr, elt),
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3897 Dynarr_at (formatted_string_extent_end_dynarr, elt),
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3898 result_str);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3899 }
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3900
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3901 in_modeline_generation = 0;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3902 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3903 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3904
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3905 /* Ensure that the given display line DL accurately represents the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3906 modeline for the given window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3907 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3908 generate_modeline (struct window *w, struct display_line *dl, int type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3909 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3910 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3911 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3912 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3913
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3914 /* Unlike display line and rune pointers, this one can't change underneath
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3915 our feet. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3916 struct display_block *db = get_display_block_from_line (dl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3917 int max_pixpos, min_pixpos, ypos_adj;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3918 Lisp_Object font_inst;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3919
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3920 /* This will actually determine incorrect inside boundaries for the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3921 modeline since it ignores the margins. However being aware of this fact
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3922 we never use those values anywhere so it doesn't matter. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3923 dl->bounds = calculate_display_line_boundaries (w, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3924
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3925 /* We are generating a modeline. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3926 dl->modeline = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3927 dl->cursor_elt = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3928
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3929 /* Reset the runes on the modeline. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3930 Dynarr_reset (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3931
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3932 if (!WINDOW_HAS_MODELINE_P (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3933 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3934 struct rune rb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3935
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3936 /* If there is a horizontal scrollbar, don't add anything. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3937 if (window_scrollbar_height (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3938 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3939
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3940 dl->ascent = DEVMETH (d, divider_height, ());
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3941 dl->descent = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3942 /* The modeline is at the bottom of the gutters. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3943 dl->ypos = WINDOW_BOTTOM (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3944
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3945 rb.findex = MODELINE_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3946 rb.xpos = dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3947 rb.width = dl->bounds.right_out - dl->bounds.left_out;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
3948 rb.charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3949 rb.endpos = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3950 rb.type = RUNE_HLINE;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3951 rb.object.hline.thickness = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3952 rb.object.hline.yoffset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3953 rb.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3954
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3955 if (!EQ (Qzero, w->modeline_shadow_thickness)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3956 && FRAME_WIN_P (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3957 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3958 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3959
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3960 dl->ypos -= shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3961 rb.xpos += shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3962 rb.width -= 2 * shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3963 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3964
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3965 Dynarr_add (db->runes, rb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3966 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3967 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3968
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3969 /* !!#### not right; needs to compute the max height of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3970 all the charsets */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3971 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3972
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3973 dl->ascent = XFONT_INSTANCE (font_inst)->ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3974 dl->descent = XFONT_INSTANCE (font_inst)->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3975
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3976 min_pixpos = dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3977 max_pixpos = dl->bounds.right_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3978
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3979 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3980 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3981 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3982
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3983 ypos_adj = shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3984 min_pixpos += shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3985 max_pixpos -= shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3986 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3987 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3988 ypos_adj = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3989
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3990 generate_formatted_string_db (b->modeline_format,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3991 b->generated_modeline_string, w, dl, db,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3992 MODELINE_INDEX, min_pixpos, max_pixpos, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3993
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3994 /* The modeline is at the bottom of the gutters. We have to wait to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3995 set this until we've generated the modeline in order to account
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3996 for any embedded faces. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3997 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3998 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3999
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4000 static Charcount
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4001 add_string_to_fstring_db_runes (pos_data *data, const Ibyte *str,
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4002 Charcount pos, Charcount min_pos,
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4003 Charcount max_pos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4004 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4005 /* This function has been Mule-ized. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4006 Charcount end;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4007 const Ibyte *cur_pos = str;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4008 struct display_block *db = data->db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4009
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4010 data->blank_width = space_width (XWINDOW (data->window));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4011 while (Dynarr_length (db->runes) < pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4012 add_blank_rune (data, NULL, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4013
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4014 end = (Dynarr_length (db->runes) +
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4015 bytecount_to_charcount (str, strlen ((const char *) str)));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4016 if (max_pos != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4017 end = min (max_pos, end);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4018
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4019 while (pos < end && *cur_pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4020 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4021 const Ibyte *old_cur_pos = cur_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4022 int succeeded;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4023
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4024 data->ch = itext_ichar (cur_pos);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4025 succeeded = (add_ichar_rune (data) != ADD_FAILED);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4026 INC_IBYTEPTR (cur_pos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4027 if (succeeded)
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4028 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4029 pos++;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4030 data->modeline_charpos++;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4031 data->bytepos += cur_pos - old_cur_pos;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4032 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4033 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4034
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4035 while (Dynarr_length (db->runes) < min_pos &&
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4036 (data->pixpos + data->blank_width <= data->max_pixpos))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4037 add_blank_rune (data, NULL, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4038
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4039 return Dynarr_length (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4040 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4041
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4042 /* #### Urk! Should also handle begin-glyphs and end-glyphs in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4043 modeline extents. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4044 static Charcount
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4045 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph,
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4046 Charcount pos, Charcount UNUSED (min_pos),
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4047 Charcount max_pos, Lisp_Object extent)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4048 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4049 /* This function has been Mule-ized. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4050 Charcount end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4051 struct display_block *db = data->db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4052 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4053
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4054 data->blank_width = space_width (XWINDOW (data->window));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4055 while (Dynarr_length (db->runes) < pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4056 add_blank_rune (data, NULL, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4057
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4058 end = Dynarr_length (db->runes) + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4059 if (max_pos != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4060 end = min (max_pos, end);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4061
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4062 gb.glyph = glyph;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4063 gb.extent = extent;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4064 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4065 pos++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4066
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4067 while (Dynarr_length (db->runes) < pos &&
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4068 (data->pixpos + data->blank_width <= data->max_pixpos))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4069 add_blank_rune (data, NULL, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4070
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4071 return Dynarr_length (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4072 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4073
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4074 /* If max_pos is == -1, it is considered to be infinite. The same is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4075 true of max_pixsize. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4076 #define SET_CURRENT_MODE_CHARS_PIXSIZE \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4077 if (Dynarr_length (data->db->runes)) \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4078 cur_pixsize = data->pixpos - Dynarr_atp (data->db->runes, 0)->xpos; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4079 else \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4080 cur_pixsize = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4081
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4082 /* Note that this function does "positions" in terms of characters and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4083 not in terms of columns. This is necessary to make the formatting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4084 work correctly when proportional width fonts are used in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4085 modeline. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4086 static Charcount
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4087 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos,
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4088 Charcount min_pos, Charcount max_pos,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4089 Lisp_Object elt, int depth, int max_pixsize,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4090 face_index findex, int type, Charcount *offset,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4091 Lisp_Object cur_ext)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4092 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4093 /* This function has been Mule-ized. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4094 /* #### The other losing things in this function are:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4095
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4096 -- C zero-terminated-string lossage.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4097 -- Non-printable characters should be converted into something
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4098 appropriate (e.g. ^F) instead of blindly being printed anyway.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4099 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4100
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4101 tail_recurse:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4102 if (depth > 10)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4103 goto invalid;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4104
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4105 depth++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4106
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4107 if (STRINGP (elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4108 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4109 /* A string. Add to the display line and check for %-constructs
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4110 within it. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4111
2552
166ed8151e62 [xemacs-hg @ 2005-02-03 16:30:33 by james]
james
parents: 2551
diff changeset
4112 Ibyte *this_str = XSTRING_DATA (elt);
166ed8151e62 [xemacs-hg @ 2005-02-03 16:30:33 by james]
james
parents: 2551
diff changeset
4113
166ed8151e62 [xemacs-hg @ 2005-02-03 16:30:33 by james]
james
parents: 2551
diff changeset
4114 while ((pos < max_pos || max_pos == -1) && *this_str)
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4115 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4116 Ibyte *last = this_str;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4117
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4118 while (*this_str && *this_str != '%')
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4119 this_str++;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4120
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4121 if (this_str != last)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4122 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4123 /* No %-construct */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4124 Charcount size =
2552
166ed8151e62 [xemacs-hg @ 2005-02-03 16:30:33 by james]
james
parents: 2551
diff changeset
4125 bytecount_to_charcount (last, this_str - last);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4126
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4127 if (size <= *offset)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4128 *offset -= size;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4129 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4130 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4131 Charcount tmp_max = (max_pos == -1 ? pos + size - *offset :
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4132 min (pos + size - *offset, max_pos));
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4133 const Ibyte *tmp_last = itext_n_addr (last, *offset);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4134
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4135 pos = add_string_to_fstring_db_runes (data, tmp_last,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4136 pos, pos, tmp_max);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4137 *offset = 0;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4138 }
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4139 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4140 else /* *this_str == '%' */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4141 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4142 Charcount spec_width = 0;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4143
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4144 this_str++; /* skip over '%' */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4145
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4146 /* We can't allow -ve args due to the "%-" construct.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4147 * Argument specifies minwidth but not maxwidth
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4148 * (maxwidth can be specified by
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4149 * (<negative-number> . <stuff>) modeline elements)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4150 */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4151 while (isdigit (*this_str))
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4152 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4153 spec_width = spec_width * 10 + (*this_str - '0');
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4154 this_str++;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4155 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4156 spec_width += pos;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4157
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4158 if (*this_str == 'M')
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4159 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4160 pos = generate_fstring_runes (w, data, pos, spec_width,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4161 max_pos, Vglobal_mode_string,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4162 depth, max_pixsize, findex,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4163 type, offset, cur_ext);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4164 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4165 else if (*this_str == '-')
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4166 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4167 Charcount num_to_add;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4168
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4169 if (max_pixsize < 0)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4170 num_to_add = 0;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4171 else if (max_pos != -1)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4172 num_to_add = max_pos - pos;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4173 else
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4174 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4175 int cur_pixsize;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4176 int dash_pixsize;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4177 Ibyte ch = '-';
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4178 SET_CURRENT_MODE_CHARS_PIXSIZE;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4179
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4180 dash_pixsize =
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4181 redisplay_text_width_string (w, findex, &ch, Qnil, 0,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4182 1);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4183
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4184 if (dash_pixsize == 0)
3094
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 3025
diff changeset
4185 num_to_add = 0;
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 3025
diff changeset
4186 else {
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 3025
diff changeset
4187 num_to_add = (max_pixsize - cur_pixsize) / dash_pixsize;
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 3025
diff changeset
4188 num_to_add++;
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 3025
diff changeset
4189 }
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4190 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4191
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4192 while (num_to_add--)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4193 pos = add_string_to_fstring_db_runes
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4194 (data, (const Ibyte *) "-", pos, pos, max_pos);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4195 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4196 else if (*this_str != 0)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4197 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4198 Ichar ch = itext_ichar (this_str);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4199 Ibyte *str;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4200 Charcount size;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4201
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4202 decode_mode_spec (w, ch, type);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4203
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4204 str = Dynarr_atp (mode_spec_ibyte_string, 0);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4205 size = bytecount_to_charcount
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4206 /* Skip the null character added by `decode_mode_spec' */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4207 (str, Dynarr_length (mode_spec_ibyte_string)) - 1;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4208
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4209 if (size <= *offset)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4210 *offset -= size;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4211 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4212 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4213 const Ibyte *tmp_str = itext_n_addr (str, *offset);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4214
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
4215 /* #### NOTE: I don't understand why a tmp_max is not
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4216 computed and used here as in the plain string case
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4217 above. -- dv */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4218 pos = add_string_to_fstring_db_runes (data, tmp_str,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4219 pos, pos,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4220 max_pos);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4221 *offset = 0;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4222 }
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4223 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4224
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4225 /* NOT this_str++. There could be any sort of character at
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4226 the current position. */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4227 INC_IBYTEPTR (this_str);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4228 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4229
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4230 if (max_pixsize > 0)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4231 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4232 int cur_pixsize;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4233 SET_CURRENT_MODE_CHARS_PIXSIZE;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4234
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4235 if (cur_pixsize >= max_pixsize)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4236 break;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4237 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4238 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4239 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4240 else if (SYMBOLP (elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4241 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4242 /* A symbol: process the value of the symbol recursively
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4243 as if it appeared here directly. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4244 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4245
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4246 if (!UNBOUNDP (tem))
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4247 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4248 /* If value is a string, output that string literally:
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4249 don't check for % within it. */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4250 if (STRINGP (tem))
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4251 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4252 Ibyte *str = XSTRING_DATA (tem);
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4253 Charcount size = string_char_length (tem);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4254
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4255 if (size <= *offset)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4256 *offset -= size;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4257 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4258 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4259 const Ibyte *tmp_str = itext_n_addr (str, *offset);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4260
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
4261 /* #### NOTE: I don't understand why a tmp_max is not
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4262 computed and used here as in the plain string case
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4263 above. -- dv */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4264 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4265 min_pos, max_pos);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4266 *offset = 0;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4267 }
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4268 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4269 /* Give up right away for nil or t. */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4270 else if (!EQ (tem, elt))
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4271 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4272 elt = tem;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4273 goto tail_recurse;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4274 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4275 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4276 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4277 else if (GENERIC_SPECIFIERP (elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4278 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4279 Lisp_Object window, tem;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
4280 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4281 tem = specifier_instance_no_quit (elt, Qunbound, window,
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
4282 ERROR_ME_DEBUG_WARN, 0, Qzero);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4283 if (!UNBOUNDP (tem))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4284 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4285 elt = tem;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4286 goto tail_recurse;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4287 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4288 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4289 else if (CONSP (elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4290 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4291 /* A cons cell: four distinct cases.
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4292 * - If first element is a string or a cons, process all the elements
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4293 * and effectively concatenate them.
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4294 * - If first element is a negative number, truncate displaying cdr to
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4295 * at most that many characters. If positive, pad (with spaces)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4296 * to at least that many characters.
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4297 * - If first element is another symbol or a boolean specifier, process
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4298 * the cadr or caddr recursively according to whether the symbol's
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4299 * value or specifier's instance is non-nil or nil.
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4300 * - If first element is , process the cadr or caddr
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4301 * recursively according to whether the instance of the specifier in
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4302 * the modeline's window is non-nil or nil.
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4303 * - If first element is an extent, process the cdr recursively
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4304 * and handle the extent's face.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4305 */
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4306
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4307 Lisp_Object car, tem;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4308
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4309 car = XCAR (elt);
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4310 if (SYMBOLP (car) || BOOLEAN_SPECIFIERP (car))
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4311 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4312 elt = XCDR (elt);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4313 if (!CONSP (elt))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4314 goto invalid;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4315
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4316 if (SYMBOLP (car))
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4317 tem = symbol_value_in_buffer (car, w->buffer);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4318 else
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4319 tem = specifier_instance_no_quit (car, Qunbound, wrap_window (w),
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
4320 ERROR_ME_DEBUG_WARN, 0, Qzero);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4321 /* elt is now the cdr, and we know it is a cons cell.
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4322 Use its car if CAR has a non-nil value. */
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4323 if (!UNBOUNDP (tem) && !NILP (tem))
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4324 {
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4325 elt = XCAR (elt);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4326 goto tail_recurse;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4327 }
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4328 /* Symbol's value or specifier's instance is nil or unbound
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4329 * Get the cddr of the original list
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4330 * and if possible find the caddr and use that.
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4331 */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4332 elt = XCDR (elt);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4333 if (NILP (elt))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4334 ;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4335 else if (!CONSP (elt))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4336 goto invalid;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4337 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4338 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4339 elt = XCAR (elt);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4340 goto tail_recurse;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4341 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4342 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4343 else if (INTP (car))
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4344 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4345 Charcount lim = XINT (car);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4346
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4347 elt = XCDR (elt);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4348
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4349 if (lim < 0)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4350 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4351 /* Negative int means reduce maximum width.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4352 * DO NOT change MIN_PIXPOS here!
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4353 * (20 -10 . foo) should truncate foo to 10 col
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4354 * and then pad to 20.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4355 */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4356 if (max_pos == -1)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4357 max_pos = pos - lim;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4358 else
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4359 max_pos = min (max_pos, pos - lim);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4360 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4361 else if (lim > 0)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4362 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4363 /* Padding specified. Don't let it be more than
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4364 * current maximum.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4365 */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4366 lim += pos;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4367 if (max_pos != -1 && lim > max_pos)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4368 lim = max_pos;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4369 /* If that's more padding than already wanted, queue it.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4370 * But don't reduce padding already specified even if
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4371 * that is beyond the current truncation point.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4372 */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4373 if (lim > min_pos)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4374 min_pos = lim;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4375 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4376 goto tail_recurse;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4377 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4378 else if (STRINGP (car) || CONSP (car))
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4379 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4380 int limit = 50;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4381
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4382 /* LIMIT is to protect against circular lists. */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4383 while (CONSP (elt) && --limit > 0
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4384 && (pos < max_pos || max_pos == -1))
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4385 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4386 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4387 XCAR (elt), depth, max_pixsize,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4388 findex, type, offset, cur_ext);
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4389 elt = XCDR (elt);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4390 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4391 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4392 else if (EXTENTP (car))
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4393 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4394 struct extent *ext = XEXTENT (car);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4395
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4396 if (EXTENT_LIVE_P (ext))
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4397 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4398 face_index old_findex = data->findex;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4399 Lisp_Object face;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4400 Lisp_Object font_inst;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4401 face_index new_findex;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4402 Bytecount start = data->bytepos;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4403
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4404 face = extent_face (ext);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4405 if (FACEP (face))
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4406 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4407 /* #### needs to merge faces, sigh */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4408 /* #### needs to handle list of faces */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4409 new_findex = get_builtin_face_cache_index (w, face);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4410 /* !!#### not right; needs to compute the max height of
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4411 all the charsets */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4412 font_inst = WINDOW_FACE_CACHEL_FONT (w, new_findex,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4413 Vcharset_ascii);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4414
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4415 data->dl->ascent = max (data->dl->ascent,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4416 XFONT_INSTANCE (font_inst)->ascent);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4417 data->dl->descent = max (data->dl->descent,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4418 XFONT_INSTANCE (font_inst)->
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4419 descent);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4420 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4421 else
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4422 new_findex = old_findex;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4423
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4424 data->findex = new_findex;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4425 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4426 XCDR (elt), depth - 1,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4427 max_pixsize, new_findex, type,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4428 offset, car);
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4429 data->findex = old_findex;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4430 Dynarr_add (formatted_string_extent_dynarr, ext);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4431 Dynarr_add (formatted_string_extent_start_dynarr, start);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4432 Dynarr_add (formatted_string_extent_end_dynarr, data->bytepos);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4433 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4434 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4435 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4436 else if (GLYPHP (elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4437 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4438 /* Glyphs are considered as one character with respect to the modeline
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4439 horizontal scrolling facility. -- dv */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4440 if (*offset > 0)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4441 *offset -= 1;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4442 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4443 pos = add_glyph_to_fstring_db_runes (data, elt, pos, pos, max_pos,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4444 cur_ext);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4445 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4446 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4447 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4448 invalid:
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4449 {
4528
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. *Needs ChangeLogs.*
Stephen J. Turnbull <stephen@xemacs.org>
parents: 4522
diff changeset
4450 const char *str = GETTEXT ("*invalid*");
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4451 Charcount size = (Charcount) strlen (str); /* is this ok ?? -- dv */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4452
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4453 if (size <= *offset)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4454 *offset -= size;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4455 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4456 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4457 const Ibyte *tmp_str =
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4458 itext_n_addr ((const Ibyte *) str, *offset);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4459
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
4460 /* #### NOTE: I don't understand why a tmp_max is not computed and
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4461 used here as in the plain string case above. -- dv */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4462 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4463 min_pos, max_pos);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4464 *offset = 0;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4465 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4466 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4467 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4468
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4469 if (min_pos > pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4470 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4471 add_string_to_fstring_db_runes (data, (const Ibyte *) "", pos,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4472 min_pos, -1);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4473 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4474
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4475 return pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4476 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4477
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4478 /* Update just the modeline. Assumes the desired display structs. If
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4479 they do not have a modeline block, it does nothing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4480 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4481 regenerate_modeline (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4482 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4483 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4484
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4485 if (!Dynarr_length (dla) || !Dynarr_atp (dla, 0)->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4486 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4487 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4488 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4489 generate_modeline (w, Dynarr_atp (dla, 0), DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4490 redisplay_update_line (w, 0, 0, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4491 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4492 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4493
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4494 /* Make sure that modeline display line is present in the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4495 display structs if the window has a modeline and update that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4496 line. Returns true if a modeline was needed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4497 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4498 ensure_modeline_generated (struct window *w, int type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4499 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4500 int need_modeline;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4501
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4502 /* minibuffer windows don't have modelines */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4503 if (MINI_WINDOW_P (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4504 need_modeline = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4505 /* windows which haven't had it turned off do */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4506 else if (WINDOW_HAS_MODELINE_P (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4507 need_modeline = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4508 /* windows which have it turned off don't have a divider if there is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4509 a horizontal scrollbar */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4510 else if (window_scrollbar_height (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4511 need_modeline = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4512 /* and in this case there is none */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4513 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4514 need_modeline = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4515
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4516 if (need_modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4517 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4518 display_line_dynarr *dla;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4519
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4520 dla = window_display_lines (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4521
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4522 /* We don't care if there is a display line which is not
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4523 currently a modeline because it is definitely going to become
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4524 one if we have gotten to this point. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4525 if (Dynarr_length (dla) == 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4526 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4527 if (Dynarr_largest (dla) > 0)
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
4528 Dynarr_increment (dla);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4529 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4530 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4531 struct display_line modeline;
4207
62d532188a28 [xemacs-hg @ 2007-10-03 10:06:39 by didierv]
didierv
parents: 4187
diff changeset
4532
62d532188a28 [xemacs-hg @ 2007-10-03 10:06:39 by didierv]
didierv
parents: 4187
diff changeset
4533 DISPLAY_LINE_INIT (modeline);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4534 Dynarr_add (dla, modeline);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4535 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4536 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4537
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4538 /* If we're adding a new place marker go ahead and generate the
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4539 modeline so that it is available for use by
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4540 window_modeline_height. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4541 generate_modeline (w, Dynarr_atp (dla, 0), type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4542 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4543
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4544 return need_modeline;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4545 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4546
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4547 /* #### Kludge or not a kludge. I tend towards the former. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4548 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4549 real_current_modeline_height (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4550 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4551 Fset_marker (w->start[CMOTION_DISP], w->start[CURRENT_DISP], w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4552 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4553
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4554 if (ensure_modeline_generated (w, CMOTION_DISP))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4555 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4556 display_line_dynarr *dla = window_display_lines (w, CMOTION_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4557
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4558 if (Dynarr_length (dla))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4559 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4560 if (Dynarr_atp (dla, 0)->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4561 return (Dynarr_atp (dla, 0)->ascent +
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4562 Dynarr_atp (dla, 0)->descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4563 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4564 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4565 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4566 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4567
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4568
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4569 /***************************************************************************/
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4570 /* */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4571 /* displayable string routines */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4572 /* */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4573 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4574
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4575 /* Given a position for a string in a window, ensure that the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4576 display line DL accurately represents the text on a line starting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4577 at the given position.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4578
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4579 Yes, this is duplicating the code of create_text_block, but it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4580 looked just too hard to change create_text_block to handle strings
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4581 *and* buffers. We already make a distinction between the two
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4582 elsewhere in the code so I think unifying them would require a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4583 complete MULE rewrite. Besides, the other distinction is that these
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4584 functions cover text that the user *cannot edit* so we can remove
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4585 everything to do with cursors, minibuffers etc. Eventually the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4586 modeline routines should be modified to use this code as it copes
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4587 with many more types of display situation. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4588
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
4589 static Charbpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4590 create_string_text_block (struct window *w, Lisp_Object disp_string,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4591 struct display_line *dl,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4592 Charcount start_pos,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4593 prop_block_dynarr **prop,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4594 face_index default_face)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4595 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4596 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4597 /* Note that a lot of the buffer controlled stuff has been left in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4598 because you might well want to make use of it (selective display
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4599 etc), its just the buffer text that we do not use. However, it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4600 seems to be possible for buffer to be nil sometimes so protect
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4601 against this case. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4602 struct buffer *b = BUFFERP (w->buffer) ? XBUFFER (w->buffer) : 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4603 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4604
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4605 /* we're working with these a lot so precalculate them */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4606 Bytecount slen = XSTRING_LENGTH (disp_string);
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4607 Bytecount byte_string_zv = slen;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4608 Bytecount byte_start_pos = string_index_char_to_byte (disp_string, start_pos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4609
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4610 pos_data data;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4611
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4612 int truncate_win = b ? window_truncation_on (w) : 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4613
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4614 /* We're going to ditch selective display for static text, it's an
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4615 FSF thing and invisible extents are the way to go here.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4616 Implementing it also relies on a number of buffer-specific
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4617 functions that we don't have the luxury of being able to use
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4618 here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4619
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4620 /* The variable ctl-arrow allows the user to specify what characters
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4621 can actually be displayed and which octal should be used for.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4622 #### This variable should probably have some rethought done to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4623 it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4624
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4625 #### It would also be really nice if you could specify that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4626 the characters come out in hex instead of in octal. Mule
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4627 does that by adding a ctl-hexa variable similar to ctl-arrow,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4628 but that's bogus -- we need a more general solution. I
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4629 think you need to extend the concept of display tables
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4630 into a more general conversion mechanism. Ideally you
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4631 could specify a Lisp function that converts characters,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4632 but this violates the Second Golden Rule and besides would
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4633 make things way way way way slow.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4634
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4635 So instead, we extend the display-table concept, which was
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4636 historically limited to 256-byte vectors, to one of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4637 following:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4638
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4639 a) A 256-entry vector, for backward compatibility;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4640 b) char-table, mapping characters to values;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4641 c) range-table, mapping ranges of characters to values;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4642 d) a list of the above.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4643
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4644 The (d) option allows you to specify multiple display tables
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4645 instead of just one. Each display table can specify conversions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4646 for some characters and leave others unchanged. The way the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4647 character gets displayed is determined by the first display table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4648 with a binding for that character. This way, you could call a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4649 function `enable-hex-display' that adds a hex display-table to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4650 the list of display tables for the current buffer.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4651
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4652 #### ...not yet implemented... Also, we extend the concept of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4653 "mapping" to include a printf-like spec. Thus you can make all
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4654 extended characters show up as hex with a display table like
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4655 this:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4656
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4657 #s(range-table data ((256 524288) (format "%x")))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4658
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4659 Since more than one display table is possible, you have
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4660 great flexibility in mapping ranges of characters. */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4661 Ichar printable_min = b ? (CHAR_OR_CHAR_INTP (b->ctl_arrow)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4662 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4663 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4664 ? 255 : 160)) : 255;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4665
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4666 Lisp_Object face_dt, window_dt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4667
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4668 /* The text display block for this display line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4669 struct display_block *db = get_display_block_from_line (dl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4670
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4671 /* The first time through the main loop we need to force the glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4672 data to be updated. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4673 int initial = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4674
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4675 /* Apparently the new extent_fragment_update returns an end position
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4676 equal to the position passed in if there are no more runs to be
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4677 displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4678 int no_more_frags = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4679
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4680 dl->used_prop_data = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4681 dl->num_chars = 0;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4682 dl->line_continuation = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4683
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4684 /* Set up faces to use for clearing areas, used by output_display_line. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4685 dl->default_findex = default_face;
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4686 if (default_face > DEFAULT_INDEX)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4687 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4688 dl->left_margin_findex = default_face;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4689 dl->right_margin_findex = default_face;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4690 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4691 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4692 {
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
4693 dl->left_margin_findex =
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4694 get_builtin_face_cache_index (w, Vleft_margin_face);
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
4695 dl->right_margin_findex =
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4696 get_builtin_face_cache_index (w, Vright_margin_face);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4697 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4698
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4699 xzero (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4700 data.ef = extent_fragment_new (disp_string, f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4701
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4702 /* These values are used by all of the rune addition routines. We add
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4703 them to this structure for ease of passing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4704 data.d = d;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
4705 data.window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4706 data.db = db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4707 data.dl = dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4708
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4709 data.byte_charpos = byte_start_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4710 data.pixpos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4711 data.last_charset = Qunbound;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4712 data.last_findex = default_face;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4713 data.result_str = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4714 data.string = disp_string;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4715
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4716 /* Set the right boundary adjusting it to take into account any end
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4717 glyph. Save the width of the end glyph for later use. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4718 data.max_pixpos = dl->bounds.right_in;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4719 data.max_pixpos -= data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4720
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4721 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4722 data.cursor_x = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4723
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4724 data.start_col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4725 /* I don't think we want this, string areas should not scroll with
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
4726 the window
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4727 data.start_col = w->hscroll;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4728 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4729 */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4730 data.byte_start_col_enabled = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4731 data.hscroll_glyph_width_adjust = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4732
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4733 /* We regenerate the line from the very beginning. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4734 Dynarr_reset (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4735
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4736 /* Why is this less than or equal and not just less than? If the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4737 starting position is already equal to the maximum we can't add
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4738 anything else, right? Wrong. We might still have a newline to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4739 add. A newline can use the room allocated for an end glyph since
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4740 if we add it we know we aren't going to be adding any end
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4741 glyph. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4742
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4743 /* #### Chuck -- I think this condition should be while (1).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4744 Otherwise if (e.g.) there is one begin-glyph and one end-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4745 and the begin-glyph ends exactly at the end of the window, the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4746 end-glyph and text might not be displayed. while (1) ensures
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4747 that the loop terminates only when either (a) there is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4748 propagation data or (b) the end-of-line or end-of-buffer is hit.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4749
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4750 #### Also I think you need to ensure that the operation
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4751 "add begin glyphs; add end glyphs; add text" is atomic and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4752 can't get interrupted in the middle. If you run off the end
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4753 of the line during that operation, then you keep accumulating
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4754 propagation data until you're done. Otherwise, if the (e.g.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4755 there's a begin glyph at a particular position and attempting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4756 to display that glyph results in window-end being hit and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4757 propagation data being generated, then the character at that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4758 position won't be displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4759
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4760 #### See also the comment after the end of this loop, below.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4761 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4762 while (data.pixpos <= data.max_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4763 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4764 /* #### This check probably should not be necessary. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4765 if (data.byte_charpos > byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4766 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4767 /* #### urk! More of this lossage! */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4768 data.byte_charpos--;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4769 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4770 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4771
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4772 /* Check for face changes. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4773 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4774 {
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4775 Lisp_Object last_glyph = Qnil;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4776 /* Deal with clipped glyphs that we have already displayed. */
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4777 if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4778 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4779 last_glyph = Dynarr_atp (*prop, 0)->data.p_glyph.glyph;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4780 Dynarr_free (*prop);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4781 *prop = 0;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4782 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4783 /* Now compute the face and begin/end-glyph information. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4784 data.findex =
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
4785 /* Remember that the extent-fragment routines deal in
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4786 Bytexpos's. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4787 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4788 /* This is somewhat cheesy but the alternative is to
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4789 propagate default_face into extent_fragment_update. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4790 if (data.findex == DEFAULT_INDEX)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4791 data.findex = default_face;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4792
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4793 get_display_tables (w, data.findex, &face_dt, &window_dt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4794
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4795 if (data.byte_charpos == data.ef->end)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4796 no_more_frags = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4797 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4798 initial = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4799
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4800 /* Determine what is next to be displayed. We first handle any
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4801 glyphs returned by glyphs_at_charbpos. If there are no glyphs to
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4802 display then we determine what to do based on the character at the
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4803 current buffer position. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4804
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4805 /* If the current position is covered by an invisible extent, do
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4806 nothing (except maybe add some ellipses).
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4807
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4808 #### The behavior of begin and end-glyphs at the edge of an
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4809 invisible extent should be investigated further. This is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4810 fairly low priority though. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4811 if (data.ef->invisible)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4812 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4813 /* #### Chuck, perhaps you could look at this code? I don't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4814 really know what I'm doing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4815 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4816 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4817 Dynarr_free (*prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4818 *prop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4819 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4820
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4821 /* The extent fragment code only sets this when we should
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4822 really display the ellipses. It makes sure the ellipses
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4823 don't get displayed more than once in a row. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4824 if (data.ef->invisible_ellipses)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4825 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4826 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4827
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4828 data.ef->invisible_ellipses_already_displayed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4829 data.ef->invisible_ellipses = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4830 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4831 gb.glyph = Vinvisible_text_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4832 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4833 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4834 /* Perhaps they shouldn't propagate if the very next thing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4835 is to display a newline (for compatibility with
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4836 selective-display-ellipses)? Maybe that's too
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4837 abstruse. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4838 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4839 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4840 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4841
638
373ced43e288 [xemacs-hg @ 2001-07-26 21:10:44 by adrian]
adrian
parents: 617
diff changeset
4842 /* #### What if we're dealing with a display table? */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4843 if (data.start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4844 data.start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4845
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4846 if (data.byte_charpos == byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4847 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4848 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4849 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4850 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4851
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4852 /* If there is propagation data, then it represents the current
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4853 buffer position being displayed. Add them and advance the
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4854 position counter. This might also add the minibuffer
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4855 prompt. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4856 else if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4857 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4858 dl->used_prop_data = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4859 *prop = add_propagation_runes (prop, &data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4860
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4861 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4862 goto done; /* gee, a really narrow window */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4863 else if (data.byte_charpos == byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4864 goto done;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4865 else if (data.byte_charpos < 0)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4866 /* #### urk urk urk! Aborts are not very fun! Fix this please! */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4867 data.byte_charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4868 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4869 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4870 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4871
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4872 /* If there are end glyphs, add them to the line. These are
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4873 the end glyphs for the previous run of text. We add them
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4874 here rather than doing them at the end of handling the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4875 previous run so that glyphs at the beginning and end of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4876 a line are handled correctly. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4877 else if (Dynarr_length (data.ef->end_glyphs) > 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4878 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4879 data.ch = string_ichar (disp_string, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4880 *prop = add_glyph_runes (&data, END_GLYPHS);
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4881
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4882 if (*prop) {
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4883 goto done;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4884 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4885 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4886
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4887 /* If there are begin glyphs, add them to the line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4888 else if (Dynarr_length (data.ef->begin_glyphs) > 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4889 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4890 data.ch = string_ichar (disp_string, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4891 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4892
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4893 if (*prop) {
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4894 goto done;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4895 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4896 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4897
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4898 /* If at end-of-buffer, we've already processed begin and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4899 end-glyphs at this point and there's no text to process,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4900 so we're done. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4901 else if (data.byte_charpos == byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4902 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4903
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4904 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4905 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4906 Lisp_Object entry = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4907 /* Get the character at the current buffer position. */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4908 data.ch = string_ichar (disp_string, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4909 if (!NILP (face_dt) || !NILP (window_dt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4910 entry = display_table_entry (data.ch, face_dt, window_dt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4911
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4912 /* If there is a display table entry for it, hand it off to
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4913 add_disp_table_entry_runes and let it worry about it. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4914 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4915 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4916 *prop = add_disp_table_entry_runes (&data, entry);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4917
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4918 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4919 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4920 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4921
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4922 /* Check if we have hit a newline character. If so, add a marker
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4923 to the line and end this loop. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4924 else if (data.ch == '\n')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4925 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4926 /* We aren't going to be adding an end glyph so give its
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4927 space back in order to make sure that the cursor can
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4928 fit. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4929 data.max_pixpos += data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4930 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4931 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4932
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4933 /* If the current character is considered to be printable, then
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4934 just add it. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4935 else if (data.ch >= printable_min)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4936 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4937 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4938 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4939 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4940 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4941
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4942 /* If the current character is a tab, determine the next tab
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4943 starting position and add a blank rune which extends from the
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4944 current pixel position to that starting position. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4945 else if (data.ch == '\t')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4946 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4947 int tab_start_pixpos = data.pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4948 int next_tab_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4949 int char_tab_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4950 int prop_width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4951
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4952 if (data.start_col > 1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4953 tab_start_pixpos -= (space_width (w) * (data.start_col - 1));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4954
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4955 next_tab_start =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4956 next_tab_position (w, tab_start_pixpos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4957 dl->bounds.left_in +
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4958 data.hscroll_glyph_width_adjust);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4959 if (next_tab_start > data.max_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4960 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4961 prop_width = next_tab_start - data.max_pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4962 next_tab_start = data.max_pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4963 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4964 data.blank_width = next_tab_start - data.pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4965 char_tab_width =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4966 (next_tab_start - tab_start_pixpos) / space_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4967
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4968 *prop = add_blank_rune (&data, w, char_tab_width);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4969
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4970 /* add_blank_rune is only supposed to be called with
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4971 sizes guaranteed to fit in the available space. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4972 assert (!(*prop));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4973
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4974 if (prop_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4975 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4976 struct prop_block pb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4977 *prop = Dynarr_new (prop_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4978
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4979 pb.type = PROP_BLANK;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4980 pb.data.p_blank.width = prop_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4981 pb.data.p_blank.findex = data.findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4982 Dynarr_add (*prop, pb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4983
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4984 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4985 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4986 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4987
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4988 /* If character is a control character, pass it off to
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4989 add_control_char_runes.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4990
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4991 The is_*() routines have undefined results on
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4992 arguments outside of the range [-1, 255]. (This
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4993 often bites people who carelessly use `char' instead
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4994 of `unsigned char'.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4995 */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4996 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4997 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4998 *prop = add_control_char_runes (&data, b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4999
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5000 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5001 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5002 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5003
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5004 /* If the character is above the ASCII range and we have not
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5005 already handled it, then print it as an octal number. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5006 else if (data.ch >= 0200)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5007 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5008 *prop = add_octal_runes (&data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5009
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5010 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5011 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5012 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5013
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5014 /* Assume the current character is considered to be printable,
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5015 then just add it. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5016 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5017 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
5018 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5019 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5020 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5021 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5022
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5023 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5024 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5025 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5026
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5027 done:
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5028
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5029 /* Determine the starting point of the next line if we did not hit the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5030 end of the buffer. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5031 if (data.byte_charpos < byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5032 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5033 /* #### This check is not correct. If the line terminated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5034 due to a begin-glyph or end-glyph hitting window-end, then
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5035 data.ch will not point to the character at data.byte_charpos. If
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5036 you make the two changes mentioned at the top of this loop,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5037 you should be able to say '(if (*prop))'. That should also
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5038 make it possible to eliminate the data.byte_charpos < BYTE_BUF_ZV (b)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5039 check. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5040
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5041 /* The common case is that the line ended because we hit a newline.
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5042 In that case, the next character is just the next buffer
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5043 position. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5044 if (data.ch == '\n')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5045 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5046 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5047 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5048
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5049 /* Otherwise we have a buffer line which cannot fit on one display
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5050 line. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5051 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5052 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5053 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5054 struct glyph_cachel *cachel;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5055
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5056 /* If the line is to be truncated then we actually have to look
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5057 for the next newline. We also add the end-of-line glyph which
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5058 we know will fit because we adjusted the right border before
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5059 we starting laying out the line. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5060 data.max_pixpos += data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5061 data.findex = default_face;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5062 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5063
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5064 if (truncate_win)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5065 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5066 Bytecount byte_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5067
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5068 /* Now find the start of the next line. */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
5069 byte_pos = byte_find_next_ichar_in_string (disp_string, '\n',
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5070 data.byte_charpos, 1);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5071
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5072 data.cursor_type = NO_CURSOR;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5073 data.byte_charpos = byte_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5074 gb.glyph = Vtruncation_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5075 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5076 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5077 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5078 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5079 /* The cursor can never be on the continuation glyph. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5080 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5081
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5082 /* data.byte_charpos is already at the start of the next line. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5083
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5084 dl->line_continuation = 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5085 gb.glyph = Vcontinuation_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5086 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5087 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5088
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5089 if (data.end_glyph_width)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5090 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5091
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5092 if (truncate_win && data.byte_charpos == byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5093 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
5094 const Ibyte *endb = itext_n_addr (XSTRING_DATA (disp_string),
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5095 byte_string_zv);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
5096 DEC_IBYTEPTR (endb);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
5097 if (itext_ichar (endb) != '\n')
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5098 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5099 /* #### Damn this losing shit. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5100 data.byte_charpos++;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5101 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5102 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5103 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5104 }
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5105 else if (data.byte_charpos == byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5106 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5107 /* create_text_block () adds a bogus \n marker here which screws
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5108 up subwindow display. Since we never have a cursor in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5109 gutter we can safely ignore it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5110 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5111 /* Calculate left whitespace boundary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5112 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5113 int elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5114
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5115 /* Whitespace past a newline is considered right whitespace. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5116 while (elt < Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5117 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5118 struct rune *rb = Dynarr_atp (db->runes, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5119
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5120 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5121 || rb->type == RUNE_BLANK)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5122 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5123 dl->bounds.left_white += rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5124 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5125 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5126 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5127 elt = Dynarr_length (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5128 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5129 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5130
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5131 /* Calculate right whitespace boundary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5132 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5133 int elt = Dynarr_length (db->runes) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5134 int done = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5135
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5136 while (!done && elt >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5137 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5138 struct rune *rb = Dynarr_atp (db->runes, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5139
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5140 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5141 && isspace (rb->object.chr.ch))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5142 && !rb->type == RUNE_BLANK)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5143 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5144 dl->bounds.right_white = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5145 done = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5146 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5147
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5148 elt--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5149
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5150 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5151
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5152 /* The line is blank so everything is considered to be right
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5153 whitespace. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5154 if (!done)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5155 dl->bounds.right_white = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5156 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5157
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5158 /* Set the display blocks bounds. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5159 db->start_pos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5160 if (Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5161 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5162 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5163
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5164 db->end_pos = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5165 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5166 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5167 db->end_pos = dl->bounds.right_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5168
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5169 calculate_baseline (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5170
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5171 dl->ascent = data.new_ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5172 dl->descent = data.new_descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5173
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5174 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5175 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5176
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5177 if (dl->ascent < ascent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5178 dl->ascent = ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5179 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5180 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5181 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5182
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5183 if (dl->descent < descent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5184 dl->descent = descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5185 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5186
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5187 calculate_yoffset (dl, db);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5188
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5189 dl->cursor_elt = data.cursor_x;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5190 /* #### lossage lossage lossage! Fix this shit! */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5191 if (data.byte_charpos > byte_string_zv)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5192 dl->end_charpos = buffer_or_string_bytexpos_to_charxpos (disp_string,
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5193 byte_string_zv);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5194 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5195 dl->end_charpos =
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5196 buffer_or_string_bytexpos_to_charxpos (disp_string,
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5197 data.byte_charpos) - 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5198 if (truncate_win)
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
5199 data.dl->num_chars =
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5200 string_column_at_point (disp_string, dl->end_charpos,
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
5201 b ? XINT (b->tab_width) : 8);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5202 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5203 /* This doesn't correctly take into account tabs and control
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5204 characters but if the window isn't being truncated then this
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5205 value isn't going to end up being used anyhow. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5206 data.dl->num_chars = dl->end_charpos - dl->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5207
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5208 /* #### handle horizontally scrolled line with text none of which
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5209 was actually laid out. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5210
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5211 /* #### handle any remainder of overlay arrow */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5212
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5213 if (*prop == ADD_FAILED)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5214 *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5215
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5216 if (truncate_win && *prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5217 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5218 Dynarr_free (*prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5219 *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5220 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5221
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5222 extent_fragment_delete (data.ef);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5223
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5224 /* #### If we started at EOB, then make sure we return a value past
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5225 it so that regenerate_window will exit properly. This is bogus.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5226 The main loop should get fixed so that it isn't necessary to call
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5227 this function if we are already at EOB. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5228
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5229 if (data.byte_charpos == byte_string_zv && byte_start_pos == byte_string_zv)
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
5230 return string_index_byte_to_char (disp_string,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5231 data.byte_charpos) + 1; /* Yuck! */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5232 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5233 return string_index_byte_to_char (disp_string, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5234 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5235
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5236 /* Given a display line and a starting position, ensure that the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5237 contents of the display line accurately represent the visual
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5238 representation of the buffer contents starting from the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5239 position when displayed in the given window. The display line ends
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5240 when the contents of the line reach the right boundary of the given
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
5241 window.
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
5242
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5243 This is very similar to generate_display_line but with the same
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5244 limitations as create_string_text_block. I have taken the liberty
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5245 of fixing the bytebpos stuff though.*/
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5246
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5247 static Charbpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5248 generate_string_display_line (struct window *w, Lisp_Object disp_string,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5249 struct display_line *dl,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5250 Charcount start_pos,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5251 prop_block_dynarr **prop,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5252 face_index default_face)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5253 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5254 Charcount ret_charcount;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5255
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5256 /* you must set bounds before calling this. */
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
5257
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5258 /* Reset what this line is using. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5259 if (dl->display_blocks)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5260 Dynarr_reset (dl->display_blocks);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5261 if (dl->left_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5262 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5263 Dynarr_free (dl->left_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5264 dl->left_glyphs = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5265 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5266 if (dl->right_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5267 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5268 Dynarr_free (dl->right_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5269 dl->right_glyphs = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5270 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5271
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5272 /* We aren't generating a modeline at the moment. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5273 dl->modeline = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5274
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5275 /* Create a display block for the text region of the line. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5276 ret_charcount = create_string_text_block (w, disp_string, dl, start_pos,
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5277 prop, default_face);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5278 dl->charpos = start_pos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5279 if (dl->end_charpos < dl->charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5280 dl->end_charpos = dl->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5281
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5282 /* If there are left glyphs associated with any character in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5283 text block, then create a display block to handle them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5284 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5285 create_left_glyph_block (w, dl, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5286
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5287 /* If there are right glyphs associated with any character in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5288 text block, then create a display block to handle them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5289 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5290 create_right_glyph_block (w, dl);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5291
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5292 return ret_charcount;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5293 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5294
2518
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5295 /*
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5296
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5297 Info on Re-entrancy crashes, with backtraces given:
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5298
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5299 (Info-goto-node "(internals)Nasty Bugs due to Reentrancy in Redisplay Structures handling QUIT")
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5300 */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5301
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5302
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5303 /* This is ripped off from regenerate_window. All we want to do is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5304 loop through elements in the string creating display lines until we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5305 have covered the provided area. Simple really. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5306 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5307 generate_displayable_area (struct window *w, Lisp_Object disp_string,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5308 int xpos, int ypos, int width, int height,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5309 display_line_dynarr* dla,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5310 Charcount start_pos,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5311 face_index default_face)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5312 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5313 int yend = ypos + height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5314 Charcount s_zv;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5315 prop_block_dynarr *prop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5316 layout_bounds bounds;
2518
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5317 int depth = -1;
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5318
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5319 /* if there's nothing to do then do nothing. code after this assumes
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5320 there is something to do. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5321 if (NILP (disp_string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5322 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5323
2518
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5324 /* See comment in regenerate_window() */
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5325 if (!in_display)
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5326 depth = enter_redisplay_critical_section ();
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5327
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5328 assert (dla);
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5329 Dynarr_reset (dla);
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5330
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5331 s_zv = string_char_length (disp_string);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5332
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5333 bounds.left_out = xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5334 bounds.right_out = xpos + width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5335 /* The inner boundaries mark where the glyph margins are located. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5336 bounds.left_in = bounds.left_out + window_left_margin_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5337 bounds.right_in = bounds.right_out - window_right_margin_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5338 /* We cannot fully calculate the whitespace boundaries as they
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5339 depend on the contents of the line being displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5340 bounds.left_white = bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5341 bounds.right_white = bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5342
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5343 while (ypos < yend)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5344 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5345 struct display_line dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5346 struct display_line *dlp;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5347 Charcount next_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5348 int local;
851
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5349 int pos_of_dlp = -1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5350
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5351 if (Dynarr_length (dla) < Dynarr_largest (dla))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5352 {
851
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5353 pos_of_dlp = Dynarr_length (dla);
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5354 dlp = Dynarr_atp (dla, pos_of_dlp);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5355 local = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5356 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5357 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5358 {
4207
62d532188a28 [xemacs-hg @ 2007-10-03 10:06:39 by didierv]
didierv
parents: 4187
diff changeset
5359 DISPLAY_LINE_INIT (dl);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5360 dlp = &dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5361 local = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5362 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5363
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5364 dlp->bounds = bounds;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5365 dlp->offset = 0;
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5366 Dynarr_lock (dla);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5367 next_pos = generate_string_display_line (w, disp_string, dlp, start_pos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5368 &prop, default_face);
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5369 Dynarr_unlock (dla);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5370 /* we need to make sure that we continue along the line if there
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5371 is more left to display otherwise we just end up redisplaying
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5372 the same chunk over and over again. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5373 if (next_pos == start_pos && next_pos < s_zv)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5374 start_pos++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5375 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5376 start_pos = next_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5377
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5378 dlp->ypos = ypos + dlp->ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5379 ypos = dlp->ypos + dlp->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5380
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5381 if (ypos > yend)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5382 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5383 int visible_height = dlp->ascent + dlp->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5384
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5385 dlp->clip = (ypos - yend);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5386 visible_height -= dlp->clip;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5387
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5388 if (visible_height < VERTICAL_CLIP (w, 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5389 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5390 if (local)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5391 free_display_line (dlp);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5392 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5393 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5394 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5395 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5396 dlp->clip = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5397
4418
9bcdf9a3a783 Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents: 4207
diff changeset
5398 if (pos_of_dlp < 0)
9bcdf9a3a783 Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents: 4207
diff changeset
5399 Dynarr_add (dla, *dlp);
9bcdf9a3a783 Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents: 4207
diff changeset
5400 else if (pos_of_dlp == Dynarr_length (dla))
9bcdf9a3a783 Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents: 4207
diff changeset
5401 Dynarr_increment (dla);
9bcdf9a3a783 Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents: 4207
diff changeset
5402 else
9bcdf9a3a783 Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents: 4207
diff changeset
5403 ABORT ();
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5404
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5405 /* #### This type of check needs to be done down in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5406 generate_display_line call. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5407 if (start_pos >= s_zv)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5408 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5409 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5410
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5411 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5412 Dynarr_free (prop);
2518
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5413
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5414 if (depth >= 0)
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5415 exit_redisplay_critical_section (depth);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5416 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5417
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5418
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5419 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5420 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5421 /* window-regeneration routines */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5422 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5423 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5424
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5425 /* For a given window and starting position in the buffer it contains,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5426 ensure that the TYPE display lines accurately represent the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5427 presentation of the window. We pass the buffer instead of getting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5428 it from the window since redisplay_window may have temporarily
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5429 changed it to the echo area buffer. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5430
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5431 static void
2518
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5432 regenerate_window (struct window *w, Charbpos start_pos, Charbpos point,
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5433 int type)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5434 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5435 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5436 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5437 int ypos = WINDOW_TEXT_TOP (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5438 int yend; /* set farther down */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5439 int yclip = WINDOW_TEXT_TOP_CLIP (w);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5440 int force;
2518
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5441 int depth = -1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5442
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5443 prop_block_dynarr *prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5444 layout_bounds bounds;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5445 display_line_dynarr *dla;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5446 int need_modeline;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5447
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5448 /* The lines had better exist by this point. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5449 if (!(dla = window_display_lines (w, type)))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
5450 ABORT ();
2518
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5451
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5452 if (!in_display)
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5453 depth = enter_redisplay_critical_section ();
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5454
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5455 /* This is one spot where a re-entrancy crash will occur, due to a check
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5456 in the dynarr to make sure it isn't "locked" */
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5457 /*
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5458
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5459 Info on Re-entrancy crashes, with backtraces given:
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5460
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5461 (Info-goto-node "(internals)Nasty Bugs due to Reentrancy in Redisplay Structures handling QUIT")
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5462 */
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5463
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5464 Dynarr_reset (dla);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5465 w->max_line_len = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5466
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5467 /* Normally these get updated in redisplay_window but it is possible
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5468 for this function to get called from some other points where that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5469 update may not have occurred. This acts as a safety check. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5470 if (!Dynarr_length (w->face_cachels))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5471 reset_face_cachels (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5472 if (!Dynarr_length (w->glyph_cachels))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5473 reset_glyph_cachels (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5474
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5475 Fset_marker (w->start[type], make_int (start_pos), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5476 Fset_marker (w->pointm[type], make_int (point), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5477 w->last_point_x[type] = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5478 w->last_point_y[type] = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5479
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5480 /* Make sure a modeline is in the structs if needed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5481 need_modeline = ensure_modeline_generated (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5482
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5483 /* Wait until here to set this so that the structs have a modeline
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5484 generated in the case where one didn't exist. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5485 yend = WINDOW_TEXT_BOTTOM (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5486
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5487 bounds = calculate_display_line_boundaries (w, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5488
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5489 /* 97/3/14 jhod: stuff added here to support pre-prompts (used for input systems) */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5490 if (MINI_WINDOW_P (w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5491 && (!NILP (Vminibuf_prompt) || !NILP (Vminibuf_preprompt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5492 && !echo_area_active (f)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5493 && start_pos == BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5494 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5495 struct prop_block pb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5496 Lisp_Object string;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5497 prop = Dynarr_new (prop_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5498
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5499 string = concat2(Vminibuf_preprompt, Vminibuf_prompt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5500 pb.type = PROP_MINIBUF_PROMPT;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5501 pb.data.p_string.str = XSTRING_DATA(string);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5502 pb.data.p_string.len = XSTRING_LENGTH(string);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5503 Dynarr_add (prop, pb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5504 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5505 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5506 prop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5507
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5508 /* When we are computing things for scrolling purposes, make
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5509 sure at least one line is always generated */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5510 force = (type == CMOTION_DISP);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5511
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5512 /* Make sure this is set always */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5513 /* Note the conversion at end */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5514 w->window_end_pos[type] = start_pos;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5515 while (ypos < yend || force)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5516 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5517 struct display_line dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5518 struct display_line *dlp;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5519 int local;
851
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5520 int pos_of_dlp = -1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5521
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5522 if (Dynarr_length (dla) < Dynarr_largest (dla))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5523 {
851
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5524 pos_of_dlp = Dynarr_length (dla);
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5525 dlp = Dynarr_atp (dla, pos_of_dlp);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5526 local = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5527 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5528 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5529 {
4207
62d532188a28 [xemacs-hg @ 2007-10-03 10:06:39 by didierv]
didierv
parents: 4187
diff changeset
5530 DISPLAY_LINE_INIT (dl);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5531 dlp = &dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5532 local = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5533 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5534
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5535 dlp->bounds = bounds;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5536 dlp->offset = 0;
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5537 Dynarr_lock (dla);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5538 start_pos = generate_display_line (w, dlp, 1, start_pos, &prop, type);
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5539 Dynarr_unlock (dla);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5540
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5541 if (yclip > dlp->ascent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5542 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5543 /* this should never happen, but if it does just display the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5544 whole line */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5545 yclip = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5546 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5547
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5548 dlp->ypos = (ypos + dlp->ascent) - yclip;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5549 ypos = dlp->ypos + dlp->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5550
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5551 /* See if we've been asked to start midway through a line, for
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5552 partial display line scrolling. */
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
5553 if (yclip)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5554 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5555 dlp->top_clip = yclip;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5556 yclip = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5557 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5558 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5559 dlp->top_clip = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5560
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5561 if (ypos > yend)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5562 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5563 int visible_height = dlp->ascent + dlp->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5564
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5565 dlp->clip = (ypos - yend);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5566 /* Although this seems strange we could have a single very
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5567 tall line visible for which we need to account for both
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5568 the top clip and the bottom clip. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5569 visible_height -= (dlp->clip + dlp->top_clip);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5570
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5571 if (visible_height < VERTICAL_CLIP (w, 1) && !force)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5572 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5573 if (local)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5574 free_display_line (dlp);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5575 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5576 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5577 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5578 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5579 dlp->clip = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5580
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5581 if (dlp->cursor_elt != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5582 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5583 /* #### This check is steaming crap. Have to get things
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5584 fixed so when create_text_block hits EOB, we're done,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5585 period. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5586 if (w->last_point_x[type] == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5587 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5588 w->last_point_x[type] = dlp->cursor_elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5589 w->last_point_y[type] = Dynarr_length (dla);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5590 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5591 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5592 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5593 /* #### This means that we've added a cursor at EOB
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5594 twice. Yuck oh yuck. */
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5595 struct display_block *db;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5596
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5597 Dynarr_lock (dla);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5598 db = get_display_block_from_line (dlp, TEXT);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5599 Dynarr_unlock (dla);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5600
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5601 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5602 dlp->cursor_elt = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5603 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5604 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5605
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5606 if (dlp->num_chars > w->max_line_len)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5607 w->max_line_len = dlp->num_chars;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5608
4418
9bcdf9a3a783 Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents: 4207
diff changeset
5609 if (pos_of_dlp < 0)
9bcdf9a3a783 Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents: 4207
diff changeset
5610 Dynarr_add (dla, *dlp);
9bcdf9a3a783 Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents: 4207
diff changeset
5611 else if (pos_of_dlp == Dynarr_length (dla))
9bcdf9a3a783 Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents: 4207
diff changeset
5612 Dynarr_increment (dla);
9bcdf9a3a783 Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents: 4207
diff changeset
5613 else
9bcdf9a3a783 Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents: 4207
diff changeset
5614 ABORT ();
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5615
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5616 /* #### This isn't right, but it is close enough for now. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5617 w->window_end_pos[type] = start_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5618
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5619 /* #### This type of check needs to be done down in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5620 generate_display_line call. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5621 if (start_pos > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5622 break;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5623
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5624 force = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5625 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5626
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5627 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5628 Dynarr_free (prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5629
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5630 /* #### More not quite right, but close enough. */
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5631 /* Ben sez: apparently window_end_pos[] is measured
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5632 as the number of characters between the window end and the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5633 end of the buffer? This seems rather weirdo. What's
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5634 the justification for this?
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5635
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5636 JV sez: Because BUF_Z (b) would be a good initial value, however
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5637 that can change. This representation allows initalizing with 0.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5638 */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5639 w->window_end_pos[type] = BUF_Z (b) - w->window_end_pos[type];
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5640
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5641 if (need_modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5642 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5643 /* We know that this is the right thing to use because we put it
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5644 there when we first started working in this function. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5645 generate_modeline (w, Dynarr_atp (dla, 0), type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5646 }
2518
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5647
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5648 if (depth >= 0)
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5649 exit_redisplay_critical_section (depth);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5650 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5651
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5652 #define REGEN_INC_FIND_START_END \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5653 do { \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5654 /* Determine start and end of lines. */ \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5655 if (!Dynarr_length (cdla)) \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5656 return 0; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5657 else \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5658 { \
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5659 if (Dynarr_atp (cdla, 0)->modeline && Dynarr_atp (ddla, 0)->modeline) \
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5660 { \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5661 dla_start = 1; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5662 } \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5663 else if (!Dynarr_atp (cdla, 0)->modeline \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5664 && !Dynarr_atp (ddla, 0)->modeline) \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5665 { \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5666 dla_start = 0; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5667 } \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5668 else \
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
5669 ABORT (); /* structs differ */ \
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5670 \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5671 dla_end = Dynarr_length (cdla) - 1; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5672 } \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5673 \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5674 start_pos = (Dynarr_atp (cdla, dla_start)->charpos \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5675 + Dynarr_atp (cdla, dla_start)->offset); \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5676 /* If this isn't true, then startp has changed and we need to do a \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5677 full regen. */ \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5678 if (startp != start_pos) \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5679 return 0; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5680 \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5681 /* Point is outside the visible region so give up. */ \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5682 if (pointm < start_pos) \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5683 return 0; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5684 \
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5685 } while (0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5686
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5687 /* This attempts to incrementally update the display structures. It
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5688 returns a boolean indicating success or failure. This function is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5689 very similar to regenerate_window_incrementally and is in fact only
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5690 called from that function. However, because of the nature of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5691 changes it deals with it sometimes makes different assumptions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5692 which can lead to success which are much more difficult to make
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5693 when dealing with buffer changes. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5694
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5695 static int
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5696 regenerate_window_extents_only_changed (struct window *w, Charbpos startp,
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5697 Charbpos pointm,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5698 Charcount beg_unchanged,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5699 Charcount end_unchanged)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5700 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5701 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5702 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5703 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5704
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5705 int dla_start = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5706 int dla_end, line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5707 int first_line, last_line;
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5708 Charbpos start_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5709 /* Don't define this in the loop where it is used because we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5710 definitely want its value to survive between passes. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5711 prop_block_dynarr *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5712
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5713 /* If we don't have any buffer change recorded but the modiff flag has
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5714 been incremented, then fail. I'm not sure of the exact circumstances
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5715 under which this can happen, but I believe that it is probably a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5716 reasonable happening. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5717 if (!point_visible (w, pointm, CURRENT_DISP)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5718 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5719 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5720
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5721 /* If the cursor is moved we attempt to update it. If we succeed we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5722 go ahead and proceed with the optimization attempt. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5723 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5724 || pointm != marker_position (w->last_point[CURRENT_DISP]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5725 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5726 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5727 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5728 struct frame *sel_f = device_selected_frame (d);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5729 int success = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5730
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5731 if (w->last_point_x[CURRENT_DISP] != -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5732 && w->last_point_y[CURRENT_DISP] != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5733 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5734
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5735 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5736 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5737 /* Always regenerate the modeline in case it is
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5738 displaying the current line or column. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5739 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5740 success = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5741 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5742 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5743 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5744 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5745 if (f->modeline_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5746 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5747 success = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5748 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5749
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5750 if (!success)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5751 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5752 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5753
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5754 if (beg_unchanged == -1 && end_unchanged == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5755 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5756
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5757 /* assert: There are no buffer modifications or they are all below the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5758 visible region. We assume that regenerate_window_incrementally has
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5759 not called us unless this is true. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5760
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5761 REGEN_INC_FIND_START_END;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5762
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5763 /* If the changed are starts before the visible area, give up. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5764 if (beg_unchanged < startp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5765 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5766
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5767 /* Find what display line the extent changes first affect. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5768 line = dla_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5769 while (line <= dla_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5770 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5771 struct display_line *dl = Dynarr_atp (cdla, line);
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5772 Charbpos lstart = dl->charpos + dl->offset;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5773 Charbpos lend = dl->end_charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5774
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5775 if (beg_unchanged >= lstart && beg_unchanged <= lend)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5776 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5777
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5778 line++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5779 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5780
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5781 /* If the changes are below the visible area then if point hasn't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5782 moved return success otherwise fail in order to be safe. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5783 if (line > dla_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5784 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5785 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5786 && pointm == marker_position (w->last_point[CURRENT_DISP]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5787 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5788 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5789 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5790 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5791
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5792 /* At this point we know what line the changes first affect. We now
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5793 begin redrawing lines as long as we are still in the affected
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5794 region and the line's size and positioning don't change.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5795 Otherwise we fail. If we fail we will have altered the desired
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5796 structs which could lead to an assertion failure. However, if we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5797 fail the next thing that is going to happen is a full regen so we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5798 will actually end up being safe. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5799 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5800 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5801 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5802 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5803
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5804 first_line = last_line = line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5805 while (line <= dla_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5806 {
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
5807 Charbpos old_start, old_end;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5808 struct display_line *cdl = Dynarr_atp (cdla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5809 struct display_line *ddl = Dynarr_atp (ddla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5810 struct display_block *db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5811 int initial_size;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5812
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5813 assert (cdl->charpos == ddl->charpos);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5814 assert (cdl->end_charpos == ddl->end_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5815 assert (cdl->offset == ddl->offset);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5816
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5817 db = get_display_block_from_line (ddl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5818 initial_size = Dynarr_length (db->runes);
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5819 old_start = ddl->charpos + ddl->offset;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5820 old_end = ddl->end_charpos + ddl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5821
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5822 /* If this is the first line being updated and it used
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5823 propagation data, fail. Otherwise we'll be okay because
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5824 we'll have the necessary propagation data. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5825 if (line == first_line && ddl->used_prop_data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5826 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5827
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
5828 generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset,
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
5829 &prop, DESIRED_DISP);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5830 ddl->offset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5831
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5832 /* #### If there is propagated stuff the fail. We could
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5833 probably actually deal with this if the line had propagated
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5834 information when originally created by a full
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5835 regeneration. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5836 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5837 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5838 Dynarr_free (prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5839 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5840 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5841
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5842 /* If any line position parameters have changed or a
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5843 cursor has disappeared or disappeared, fail. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5844 db = get_display_block_from_line (ddl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5845 if (cdl->ypos != ddl->ypos
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5846 || cdl->ascent != ddl->ascent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5847 || cdl->descent != ddl->descent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5848 || cdl->top_clip != ddl->top_clip
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5849 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5850 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5851 || old_start != ddl->charpos
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5852 || old_end != ddl->end_charpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5853 || initial_size != Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5854 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5855 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5856 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5857
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5858 if (ddl->cursor_elt != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5859 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5860 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5861 w->last_point_y[DESIRED_DISP] = line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5862 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5863
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5864 last_line = line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5865
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5866 /* If the extent changes end on the line we just updated then
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5867 we're done. Otherwise go on to the next line. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5868 if (end_unchanged <= ddl->end_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5869 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5870 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5871 line++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5872 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5873
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5874 redisplay_update_line (w, first_line, last_line, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5875 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5876 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5877
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5878 /* Attempt to update the display data structures based on knowledge of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5879 the changed region in the buffer. Returns a boolean indicating
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5880 success or failure. If this function returns a failure then a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5881 regenerate_window _must_ be performed next in order to maintain
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5882 invariants located here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5883
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5884 static int
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5885 regenerate_window_incrementally (struct window *w, Charbpos startp,
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5886 Charbpos pointm)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5887 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5888 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5889 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5890 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5891 Charcount beg_unchanged, end_unchanged;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5892 Charcount extent_beg_unchanged, extent_end_unchanged;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5893
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5894 int dla_start = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5895 int dla_end, line;
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5896 Charbpos start_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5897
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5898 /* If this function is called, the current and desired structures
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5899 had better be identical. If they are not, then that is a bug. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5900 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5901
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5902 /* We don't handle minibuffer windows yet. The minibuffer prompt
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5903 screws us up. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5904 if (MINI_WINDOW_P (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5905 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5906
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5907 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5908 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5909 ? -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5910 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5911
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5912 /* If nothing has changed in the buffer, then make sure point is ok
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5913 and succeed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5914 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5915 return regenerate_window_extents_only_changed (w, startp, pointm,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5916 extent_beg_unchanged,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5917 extent_end_unchanged);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5918
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5919 /* We can't deal with deleted newlines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5920 if (BUF_NEWLINE_WAS_DELETED (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5921 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5922
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5923 beg_unchanged = BUF_BEGIN_UNCHANGED (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5924 end_unchanged = (BUF_END_UNCHANGED (b) == -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5925 ? -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5926 : BUF_Z (b) - BUF_END_UNCHANGED (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5927
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5928 REGEN_INC_FIND_START_END;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5929
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5930 /* If the changed area starts before the visible area, give up. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5931 if (beg_unchanged < startp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5932 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5933
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5934 /* Find what display line the buffer changes first affect. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5935 line = dla_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5936 while (line <= dla_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5937 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5938 struct display_line *dl = Dynarr_atp (cdla, line);
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5939 Charbpos lstart = dl->charpos + dl->offset;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5940 Charbpos lend = dl->end_charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5941
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5942 if (beg_unchanged >= lstart && beg_unchanged <= lend)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5943 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5944
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5945 line++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5946 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5947
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5948 /* If the changes are below the visible area then if point hasn't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5949 moved return success otherwise fail in order to be safe. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5950 if (line > dla_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5951 return regenerate_window_extents_only_changed (w, startp, pointm,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5952 extent_beg_unchanged,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5953 extent_end_unchanged);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5954 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5955 /* At this point we know what line the changes first affect. We
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5956 now redraw that line. If the changes are contained within it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5957 we are going to succeed and can update just that one line.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5958 Otherwise we fail. If we fail we will have altered the desired
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5959 structs which could lead to an assertion failure. However, if
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5960 we fail the next thing that is going to happen is a full regen
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5961 so we will actually end up being safe. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5962 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5963 prop_block_dynarr *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5964 struct display_line *cdl = Dynarr_atp (cdla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5965 struct display_line *ddl = Dynarr_atp (ddla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5966
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5967 assert (cdl->charpos == ddl->charpos);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5968 assert (cdl->end_charpos == ddl->end_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5969 assert (cdl->offset == ddl->offset);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5970
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5971 /* If the line continues to next display line, fail. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5972 if (ddl->line_continuation)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5973 return 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5974
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5975 /* If the line was generated using propagation data, fail. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5976 if (ddl->used_prop_data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5977 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5978
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
5979 generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset,
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
5980 &prop, DESIRED_DISP);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5981 ddl->offset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5982
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5983 /* If there is propagated stuff then it is pretty much a
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5984 guarantee that more than just the one line is affected. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5985 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5986 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5987 Dynarr_free (prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5988 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5989 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5990
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5991 /* If the line continues to next display line, fail. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5992 if (ddl->line_continuation)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5993 return 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5994
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5995 /* If any line position parameters have changed or a
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5996 cursor has disappeared or disappeared, fail. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5997 if (cdl->ypos != ddl->ypos
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5998 || cdl->ascent != ddl->ascent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5999 || cdl->descent != ddl->descent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6000 || cdl->top_clip != ddl->top_clip
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6001 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6002 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6003 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6004 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6005 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6006
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6007 /* If the changed area also ends on this line, then we may be in
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6008 business. Update everything and return success. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6009 if (end_unchanged >= ddl->charpos && end_unchanged <= ddl->end_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6010 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6011 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6012 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6013 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6014 w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6015 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6016 w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6017
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6018 if (ddl->cursor_elt != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6019 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6020 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6021 w->last_point_y[DESIRED_DISP] = line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6022 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6023
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6024 redisplay_update_line (w, line, line, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6025 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6026
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6027 /* #### For now we just flush the cache until this has been
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6028 tested. After that is done, this should correct the
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6029 cache directly. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6030 Dynarr_reset (w->line_start_cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6031
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6032 /* Adjust the extent changed boundaries to remove any
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6033 overlap with the buffer changes since we've just
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6034 successfully updated that area. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6035 if (extent_beg_unchanged != -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6036 && extent_beg_unchanged >= beg_unchanged
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6037 && extent_beg_unchanged < end_unchanged)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6038 extent_beg_unchanged = end_unchanged;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6039
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6040 if (extent_end_unchanged != -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6041 && extent_end_unchanged >= beg_unchanged
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6042 && extent_end_unchanged < end_unchanged)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6043 extent_end_unchanged = beg_unchanged - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6044
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6045 if (extent_end_unchanged <= extent_beg_unchanged)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6046 extent_beg_unchanged = extent_end_unchanged = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6047
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6048 /* This could lead to odd results if it fails, but since the
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6049 buffer changes update succeeded this probably will to.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6050 We already know that the extent changes start at or after
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6051 the line because we checked before entering the loop. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6052 if (extent_beg_unchanged != -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6053 && extent_end_unchanged != -1
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6054 && ((extent_beg_unchanged < ddl->charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6055 || (extent_end_unchanged > ddl->end_charpos)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6056 return regenerate_window_extents_only_changed (w, startp, pointm,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6057 extent_beg_unchanged,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6058 extent_end_unchanged);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6059 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6060 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6061 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6062 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6063
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6064 /* Oh, well. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6065 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6066 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6067
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6068 /* Given a window and a point, update the given display lines such
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6069 that point is displayed in the middle of the window.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6070 Return the window's new start position. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6071
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6072 static Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6073 regenerate_window_point_center (struct window *w, Charbpos point, int type)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6074 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6075 Charbpos startp;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6076
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6077 /* We need to make sure that the modeline is generated so that the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6078 window height can be calculated correctly. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6079 ensure_modeline_generated (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6080
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6081 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6082 regenerate_window (w, startp, point, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6083 Fset_marker (w->start[type], make_int (startp), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6084
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6085 return startp;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6086 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6087
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6088 /* Given a window and a set of display lines, return a boolean
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6089 indicating whether the given point is contained within. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6090
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6091 static int
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6092 point_visible (struct window *w, Charbpos point, int type)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6093 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6094 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6095 display_line_dynarr *dla = window_display_lines (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6096 int first_line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6097
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6098 if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6099 first_line = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6100 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6101 first_line = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6102
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6103 if (Dynarr_length (dla) > first_line)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6104 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6105 Charbpos start, end;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6106 struct display_line *dl = Dynarr_atp (dla, first_line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6107
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6108 start = dl->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6109 end = BUF_Z (b) - w->window_end_pos[type] - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6110
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6111 if (point >= start && point <= end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6112 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6113 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6114 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6115 dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6116
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6117 if (point >= (dl->charpos + dl->offset)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6118 && point <= (dl->end_charpos + dl->offset))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6119 return !dl->clip;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6120 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6121 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6122 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6123 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6124 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6125 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6126 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6127 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6128 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6129 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6130 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6131 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6132
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6133 /* Return pixel position the middle of the window, not including the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6134 modeline and any potential horizontal scrollbar. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6135
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6136 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6137 window_half_pixpos (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6138 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6139 return WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6140 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6141
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6142 /* Return the display line which is currently in the middle of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6143 window W for display lines TYPE. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6144
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6145 int
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6146 line_at_center (struct window *w, int type, Charbpos start, Charbpos point)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6147 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6148 display_line_dynarr *dla;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6149 int half;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6150 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6151 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6152
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6153 if (type == CMOTION_DISP)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6154 regenerate_window (w, start, point, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6155
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6156 dla = window_display_lines (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6157 half = window_half_pixpos (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6158
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6159 for (elt = first_elt; elt < Dynarr_length (dla); elt++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6160 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6161 struct display_line *dl = Dynarr_atp (dla, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6162 int line_bot = dl->ypos + dl->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6163
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6164 if (line_bot > half)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6165 return elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6166 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6167
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6168 /* We may not have a line at the middle if the end of the buffer is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6169 being displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6170 return -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6171 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6172
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6173 /* Return a value for point that would place it at the beginning of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6174 the line which is in the middle of the window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6175
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6176 Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6177 point_at_center (struct window *w, int type, Charbpos start, Charbpos point)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6178 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6179 /* line_at_center will regenerate the display structures, if necessary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6180 int line = line_at_center (w, type, start, point);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6181
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6182 if (line == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6183 return BUF_ZV (XBUFFER (w->buffer));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6184 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6185 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6186 display_line_dynarr *dla = window_display_lines (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6187 struct display_line *dl = Dynarr_atp (dla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6188
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6189 return dl->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6190 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6191 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6192
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6193 /* For a given window, ensure that the current visual representation
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6194 is accurate. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6195
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6196 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6197 redisplay_window (Lisp_Object window, int skip_selected)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6198 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6199 struct window *w = XWINDOW (window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6200 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6201 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6202 Lisp_Object old_buffer = w->buffer;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6203 Lisp_Object the_buffer = w->buffer;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6204 struct buffer *b;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6205 int echo_active = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6206 int startp = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6207 int pointm;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6208 int old_startp = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6209 int old_pointm = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6210 int selected_in_its_frame;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6211 int selected_globally;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6212 int skip_output = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6213 int truncation_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6214 int inactive_minibuffer =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6215 (MINI_WINDOW_P (w) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6216 (f != device_selected_frame (d)) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6217 !is_surrogate_for_selected_frame (f));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6218
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6219 /* #### In the new world this function actually does a bunch of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6220 optimizations such as buffer-based scrolling, but none of that is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6221 implemented yet. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6222
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6223 /* If this is a combination window, do its children; that's all.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6224 The selected window is always a leaf so we don't check for
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6225 skip_selected here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6226 if (!NILP (w->vchild))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6227 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6228 redisplay_windows (w->vchild, skip_selected);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6229 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6230 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6231 if (!NILP (w->hchild))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6232 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6233 redisplay_windows (w->hchild, skip_selected);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6234 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6235 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6236
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6237 /* Is this window the selected window on its frame? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6238 selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6239 selected_globally =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6240 selected_in_its_frame &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6241 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6242 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6243 XFRAME(DEVICE_SELECTED_FRAME(d)) == f;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6244 if (skip_selected && selected_in_its_frame)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6245 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6246
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6247 /* It is possible that the window is not fully initialized yet. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6248 if (NILP (w->buffer))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6249 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6250
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6251 if (MINI_WINDOW_P (w) && echo_area_active (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6252 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6253 w->buffer = the_buffer = Vecho_area_buffer;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6254 echo_active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6255 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6256
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6257 b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6258
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6259 if (echo_active)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6260 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6261 old_pointm = selected_globally
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6262 ? BUF_PT (b)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6263 : marker_position (w->pointm[CURRENT_DISP]);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6264 pointm = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6265 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6266 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6267 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6268 if (selected_globally)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6269 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6270 pointm = BUF_PT (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6271 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6272 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6273 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6274 pointm = marker_position (w->pointm[CURRENT_DISP]);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6275
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6276 if (pointm < BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6277 pointm = BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6278 else if (pointm > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6279 pointm = BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6280 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6281 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6282 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm), the_buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6283
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6284 /* If the buffer has changed we have to invalidate all of our face
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6285 cache elements. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6286 if ((!echo_active && b != window_display_buffer (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6287 || !Dynarr_length (w->face_cachels)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6288 || f->faces_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6289 reset_face_cachels (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6290 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6291 mark_face_cachels_as_not_updated (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6292
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6293 /* Ditto the glyph cache elements, although we do *not* invalidate
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6294 the cache purely because glyphs have changed - this is now
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6295 handled by the dirty flag.*/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6296 if ((!echo_active && b != window_display_buffer (w))
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6297 || !Dynarr_length (w->glyph_cachels) || f->faces_changed)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6298 reset_glyph_cachels (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6299 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6300 mark_glyph_cachels_as_not_updated (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6301
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6302 /* If the marker's buffer is not the window's buffer, then we need
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6303 to find a new starting position. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6304 if (!MINI_WINDOW_P (w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6305 && !EQ (Fmarker_buffer (w->start[CURRENT_DISP]), w->buffer))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6306 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6307 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6308
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6309 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6310 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6311
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6312 if (echo_active)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6313 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6314 old_startp = marker_position (w->start[CURRENT_DISP]);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6315 startp = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6316 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6317 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6318 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6319 startp = marker_position (w->start[CURRENT_DISP]);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6320 if (startp < BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6321 startp = BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6322 else if (startp > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6323 startp = BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6324 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6325 Fset_marker (w->start[DESIRED_DISP], make_int (startp), the_buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6326
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6327 truncation_changed = (find_window_mirror (w)->truncate_win !=
647
b39c14581166 [xemacs-hg @ 2001-08-13 04:45:47 by ben]
ben
parents: 638
diff changeset
6328 (unsigned int) window_truncation_on (w));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6329
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6330 /* If w->force_start is set, then some function set w->start and we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6331 should display from there and change point, if necessary, to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6332 ensure that it is visible. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6333 if (w->force_start || inactive_minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6334 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6335 w->force_start = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6336 w->last_modified[DESIRED_DISP] = Qzero;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6337 w->last_facechange[DESIRED_DISP] = Qzero;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6338
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6339 regenerate_window (w, startp, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6340
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6341 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6342 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6343 pointm = point_at_center (w, DESIRED_DISP, 0, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6344
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6345 if (selected_globally)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6346 BUF_SET_PT (b, pointm);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6347
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6348 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6349 the_buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6350
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6351 /* #### BUFU amounts of overkill just to get the cursor
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6352 location marked properly. FIX ME FIX ME FIX ME */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6353 regenerate_window (w, startp, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6354 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6355
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6356 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6357 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6358
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6359 /* If nothing has changed since the last redisplay, then we just
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6360 need to make sure that point is still visible. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6361 if (XINT (w->last_modified[CURRENT_DISP]) >= BUF_MODIFF (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6362 && XINT (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6363 && pointm >= startp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6364 /* This check is to make sure we restore the minibuffer after a
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6365 temporary change to the echo area. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6366 && !(MINI_WINDOW_P (w) && f->buffers_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6367 && !f->frame_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6368 && !truncation_changed
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6369 /* check whether start is really at the beginning of a line GE */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6370 && (!w->start_at_line_beg || beginning_of_line_p (b, startp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6371 )
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6372 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6373 /* Check if the cursor has actually moved. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6374 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6375 && pointm == marker_position (w->last_point[CURRENT_DISP])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6376 && selected_globally
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6377 && !w->windows_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6378 && !f->clip_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6379 && !f->extents_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6380 && !f->faces_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6381 && !f->glyphs_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6382 && !f->subwindows_changed
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6383 /* && !f->subwindows_state_changed*/
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6384 && !f->point_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6385 && !f->windows_structure_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6386 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6387 /* If not, we're done. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6388 if (f->modeline_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6389 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6390
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6391 skip_output = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6392 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6393 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6394 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6395 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6396 /* If the new point is visible in the redisplay structures,
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6397 then let the output update routines handle it, otherwise
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6398 do things the hard way. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6399 if (!w->windows_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6400 && !f->clip_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6401 && !f->extents_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6402 && !f->faces_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6403 && !f->glyphs_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6404 && !f->subwindows_changed
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6405 /* && !f->subwindows_state_changed*/
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6406 && !f->windows_structure_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6407 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6408 if (point_visible (w, pointm, CURRENT_DISP)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6409 && w->last_point_x[CURRENT_DISP] != -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6410 && w->last_point_y[CURRENT_DISP] != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6411 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6412 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6413 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6414 /* Always regenerate in case it is displaying
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6415 the current line or column. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6416 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6417
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6418 skip_output = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6419 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6420 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6421 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6422 else if (!selected_in_its_frame && !f->point_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6423 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6424 if (f->modeline_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6425 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6426
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6427 skip_output = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6428 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6429 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6430 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6431
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6432 /* If we weren't able to take the shortcut method, then use
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6433 the brute force method. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6434 regenerate_window (w, startp, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6435
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6436 if (point_visible (w, pointm, DESIRED_DISP))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6437 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6438 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6439 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6440
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6441 /* Check if the starting point is no longer at the beginning of a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6442 line, in which case find a new starting point. We also recenter
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6443 if our start position is equal to point-max. Otherwise we'll end
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6444 up with a blank window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6445 else if (((w->start_at_line_beg || MINI_WINDOW_P (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6446 && !(startp == BUF_BEGV (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6447 || BUF_FETCH_CHAR (b, startp - 1) == '\n'))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6448 || (pointm == startp &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6449 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6450 startp < marker_position (w->last_start[CURRENT_DISP]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6451 || (startp == BUF_ZV (b)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6452 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6453 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6454
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6455 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6456 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6457 /* See if we can update the data structures locally based on
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6458 knowledge of what changed in the buffer. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6459 else if (!w->windows_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6460 && !f->clip_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6461 && !f->faces_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6462 && !f->glyphs_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6463 && !f->subwindows_changed
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6464 /* && !f->subwindows_state_changed*/
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6465 && !f->windows_structure_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6466 && !f->frame_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6467 && !truncation_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6468 && pointm >= startp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6469 && regenerate_window_incrementally (w, startp, pointm))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6470 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6471 if (f->modeline_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6472 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6473 || XINT (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6474 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6475
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6476 skip_output = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6477 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6478 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6479 /* #### This is where a check for structure based scrolling would go. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6480 /* If all else fails, try just regenerating and see what happens. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6481 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6482 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6483 regenerate_window (w, startp, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6484
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6485 if (point_visible (w, pointm, DESIRED_DISP))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6486 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6487 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6488
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6489 /* We still haven't gotten the window regenerated with point
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6490 visible. Next we try scrolling a little and see if point comes
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6491 back onto the screen. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6492 if (scroll_step > 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6493 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6494 int scrolled = scroll_conservatively;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6495 for (; scrolled >= 0; scrolled -= scroll_step)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6496 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6497 startp = vmotion (w, startp,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6498 (pointm < startp) ? -scroll_step : scroll_step, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6499 regenerate_window (w, startp, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6500
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6501 if (point_visible (w, pointm, DESIRED_DISP))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6502 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6503 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6504 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6505
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6506 /* We still haven't managed to get the screen drawn with point on
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6507 the screen, so just center it and be done with it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6508 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6509
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6510
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6511 regeneration_done:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6512
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6513 /* If the window's frame is changed then reset the current display
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6514 lines in order to force a full repaint. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6515 if (f->frame_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6516 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6517 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6518
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6519 Dynarr_reset (cla);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6520 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6521
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6522 /* Must do this before calling redisplay_output_window because it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6523 sets some markers on the window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6524 if (echo_active)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6525 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6526 w->buffer = old_buffer;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6527 Fset_marker (w->pointm[DESIRED_DISP], make_int (old_pointm), old_buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6528 Fset_marker (w->start[DESIRED_DISP], make_int (old_startp), old_buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6529 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6530
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6531 /* These also have to be set before calling redisplay_output_window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6532 since it sets the CURRENT_DISP values based on them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6533 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6534 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6535 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6536 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6537
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6538 if (!skip_output)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6539 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6540 Charbpos start = marker_position (w->start[DESIRED_DISP]);
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6541 Charbpos end = (w->window_end_pos[DESIRED_DISP] == -1
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6542 ? BUF_ZV (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6543 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6544 /* Don't pollute the cache if not sure if we are correct */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6545 if (w->start_at_line_beg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6546 update_line_start_cache (w, start, end, pointm, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6547 redisplay_output_window (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6548 /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6549 * If we just displayed the echo area, the line start cache is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6550 * no longer valid, because the minibuffer window is associated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6551 * with the window now.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6552 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6553 if (echo_active)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6554 w->line_cache_last_updated = make_int (-1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6555 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6556
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6557 /* #### This should be dependent on face changes and will need to be
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6558 somewhere else once tty updates occur on a per-frame basis. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6559 mark_face_cachels_as_clean (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6560
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
6561 /* The glyph cachels only get dirty if someone changed something.
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
6562 Since redisplay has now effectively ended we can reset the dirty
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
6563 flag since everything must be up-to-date. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6564 if (glyphs_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6565 mark_glyph_cachels_as_clean (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6566
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6567 w->windows_changed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6568 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6569
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6570 /* Call buffer_reset_changes for all buffers present in any window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6571 currently visible in all frames on all devices. #### There has to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6572 be a better way to do this. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6573
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6574 static int
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
6575 reset_buffer_changes_mapfun (struct window *w, void *UNUSED (closure))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6576 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6577 buffer_reset_changes (XBUFFER (w->buffer));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6578 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6579 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6580
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6581 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6582 reset_buffer_changes (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6583 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6584 Lisp_Object frmcons, devcons, concons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6585
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6586 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6587 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6588 struct frame *f = XFRAME (XCAR (frmcons));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6589
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6590 if (FRAME_REPAINT_P (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6591 map_windows (f, reset_buffer_changes_mapfun, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6592 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6593 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6594
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6595 /* Ensure that all windows underneath the given window in the window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6596 hierarchy are correctly displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6597
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6598 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6599 redisplay_windows (Lisp_Object window, int skip_selected)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6600 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6601 for (; !NILP (window) ; window = XWINDOW (window)->next)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6602 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6603 redisplay_window (window, skip_selected);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6604 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6605 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6606
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6607 /* Register an action to be called at the end of redisplay.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6608 in_display is 0 when this is called.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6609 This is used when it is discovered that an action needs to be taken,
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6610 but it's during redisplay, so it's not safe. (Typically, it's an action
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6611 that needs to enter redisplay, which can't happen reentrantly.)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6612
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6613 NEVER signal an error in these functions.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6614 */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6615
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6616 void
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6617 register_post_redisplay_action (void (*fun) (Lisp_Object), Lisp_Object arg)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6618 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6619 Vpost_redisplay_actions = nconc2 (Vpost_redisplay_actions,
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6620 list1 (Fcons (make_opaque_ptr
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6621 ((void *) fun), arg)));
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6622 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6623
1320
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6624 static int running_post_redisplay_actions;
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6625
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6626 static void
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6627 run_post_redisplay_actions (void)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6628 {
1320
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6629 int depth;
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6630
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6631 if (running_post_redisplay_actions)
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6632 return;
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6633
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6634 depth = internal_bind_int (&running_post_redisplay_actions, 1);
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6635 /* If the function pushes further actions, they will be tacked onto
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6636 the end of the list, and we'll run them when we're done with the
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6637 current ones. */
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6638 while (!NILP (Vpost_redisplay_actions))
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6639 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6640 Lisp_Object car = XCAR (Vpost_redisplay_actions);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6641 void (*fun) (Lisp_Object) =
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6642 (void (*)(Lisp_Object)) get_opaque_ptr (XCAR (car));
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6643 (*fun) (XCDR (car));
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6644 free_opaque_ptr (XCAR (car));
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6645 free_cons (car);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6646 Vpost_redisplay_actions = XCDR (Vpost_redisplay_actions);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6647 }
1320
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6648 unbind_to (depth);
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6649 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6650
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6651 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6652
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6653 static Lisp_Object
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
6654 commit_ritual_suicide (Lisp_Object UNUSED (ceci_nest_pas_une_pipe))
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6655 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6656 assert (!in_display);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6657 return Qnil;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6658 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6659
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6660 #endif
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6661
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6662 /* Within the guts of redisplay, we are defenseless and cannot allow any of
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6663 the following to happen:
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6664
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6665 1) garbage collection
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6666 2) QUIT
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6667 3) any non-local exits
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6668 4) frame size changes
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6669 5) deletion of any buffers, windows, frames, etc.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6670 6) modification of buffer text
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6671 7) reentrant entry of redisplay (see the stack trace above
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6672 generate_displayable_area())
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6673
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6674 The general reason is that the redisplay code is written to assume that
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6675 it is the only code running, and thus (a) cannot tolerate structures
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6676 changed out from under it (hence 1, 4, 5, 6, 7) and (b) at various points
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6677 within redisplay the redisplay structures may be in an inconsistent
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6678 state and there are no unwind-protects to clean the structures up in
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6679 case of non-local exit (hence 2, 3). Fixing redisplay to address these
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6680 issues is hard and perhaps not worth it (and might slow things down a
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6681 fair amount). We address 1, 4, 5 and 6 ourselves inside of
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6682 enter_redisplay_critical_section() by simply inhibiting them, but we
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6683 cannot handle 2 and 3, which must be handled at the actual point where
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6684 they may occur (especially, internal_equal() or any place that may call
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6685 Lisp), by wrapping the code in call_trapping_problems() or
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6686 call_with_suspended_errors(). [[ NOTE: We could address QUIT by inhibiting
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6687 it but this would be anti-social because it would prevent the user from
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6688 interrupting any Lisp code called within the critical section. With the
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6689 call_*() wrapping, C-g will interrupt the Lisp code and throw back to
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6690 the innermost wrapping. ]] In fact we do turn off QUIT handling, since
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6691 it's just too dangerous otherwise. See below.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6692
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6693 Code calling enter_redisplay_critical_section() must check for reentrancy
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6694 (#7) and take appropriate corrective action.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6695
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6696 To help debug potential problems, we arrange (when
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6697 ERROR_CHECK_TRAPPING_PROBLEMS is set) to crash automatically every time
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6698 we execute QUIT or call Lisp code unless proper wrapping is in place, as
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6699 well as further checks when we actually Fsignal(), Fthrow(),
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6700 garbage_collect_1().
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6701
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6702 #### If a frame-size change does occur we should probably actually be
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6703 preempting redisplay. */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6704
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6705 /* Count of number of recursive times we call
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6706 enter_redisplay_critical_section() or
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6707 enter_redisplay_critical_section_maybe().
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6708 enter_redisplay_critical_section() cannot occur reentrantly but we have
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6709 to know in the *maybe() version whether to exit the section when we're
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6710 done. */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6711 static int in_display_nesting;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6712
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6713 static Lisp_Object
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
6714 end_hold_frame_size_changes (Lisp_Object UNUSED (obj))
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6715 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6716 if (!hold_frame_size_changes)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6717 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6718 /* we used to have a function to do this for only one frame, and
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6719 it was typical to call it at the end of a critical section
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6720 (which occurs once per frame); but what then happens if multiple
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6721 frames have frame changes held up?
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6722
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6723 This means we are O(N^2) over frames. I seriously doubt it matters.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6724 --ben */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6725 Lisp_Object frmcons, devcons, concons;
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6726
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6727 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6728 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6729 struct frame *f = XFRAME (XCAR (frmcons));
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6730 if (f->size_change_pending)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6731 change_frame_size (f, f->new_height, f->new_width, 0);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6732 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6733 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6734 return Qnil;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6735 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6736
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6737 /* Call this to temporarily prevent frame-size changes from being processed.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6738 To undo, use unbind_to(), passing it the value returned by this function.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6739 */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6740
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6741 int
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6742 begin_hold_frame_size_changes (void)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6743 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6744 int depth = specpdl_depth ();
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6745 record_unwind_protect (end_hold_frame_size_changes, Qnil);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6746 internal_bind_int (&hold_frame_size_changes, 1 + hold_frame_size_changes);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6747 return depth;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6748 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6749
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6750 int
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6751 enter_redisplay_critical_section (void)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6752 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6753 int depth = specpdl_depth ();
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6754
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6755 /* Reentrant entry is deadly. The calling function must check for this. */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6756 assert (!in_display);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6757 begin_hold_frame_size_changes ();
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6758 /* Make sure in_display gets reset, but don't set it yet so that
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6759 commit_ritual_suicide() can be used. */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6760 internal_bind_int (&in_display, 0);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6761 internal_bind_int (&in_display_nesting, 1 + in_display_nesting);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6762 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6763 /* Force every call to QUIT to check for in_displayness. This will
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6764 verify proper wrapping, as in the previous comment, aborting if not. */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6765 something_happened++;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6766 /* Verify that no nonlocal exits blow past us. */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6767 record_unwind_protect (commit_ritual_suicide, Qnil);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6768 #endif
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6769 in_display++;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6770
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6771 set_trapping_problems_flags (INHIBIT_ANY_CHANGE_AFFECTING_REDISPLAY);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6772 /* Even checking for QUIT can cause arbitrary Lisp code to be executed,
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6773 e.g. through a menu handler. We really don't want that happening
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6774 inside of redisplay. Code that we `eval' is at least written with the
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6775 expectation that it's inside of redisplay, and shouldn't try anything
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6776 weird; but that's not the case for menu code (e.g. custom loads huge
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6777 amounts of LISP FILES from a menu handler! FMH!). Safest just to turn
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6778 this off. We could turn it on using UNINHIBIT_QUIT or
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6779 begin_do_check_for_quit() in certain places if we want, if we know
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6780 it's not in an especially tricky place. */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6781 begin_dont_check_for_quit ();
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6782 return depth;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6783 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6784
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6785 void
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6786 exit_redisplay_critical_section (int depth)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6787 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6788 in_display--;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6789 assert (!in_display);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6790 unbind_to (depth);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6791
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6792 run_post_redisplay_actions ();
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6793 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6794
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6795 /* Enter the redisplay critical section if we're not already in it. This
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6796 is for code that needs frame changes held up and other protections from
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6797 being inside, but doesn't modify the redisplay structures, and doesn't
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6798 look at them in a way that they will be confused by inconsistencies. */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6799
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6800 int
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6801 enter_redisplay_critical_section_maybe (void)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6802 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6803 if (!in_display)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6804 return enter_redisplay_critical_section ();
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6805 else
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6806 return internal_bind_int (&in_display_nesting, 1 + in_display_nesting);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6807 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6808
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6809 void
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6810 exit_redisplay_critical_section_maybe (int depth)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6811 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6812 if (in_display_nesting == 1)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6813 exit_redisplay_critical_section (depth);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6814 else
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6815 unbind_to (depth);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6816 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6817
1279
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6818 /* Ensure that all windows on the given frame are correctly displayed.
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6819 Return non-zero if pre-empted. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6820
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6821 int
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6822 redisplay_frame (struct frame *f, int preemption_check)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6823 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6824 struct device *d = XDEVICE (f->device);
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6825 int depth;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6826
1279
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6827 assert (f->init_finished);
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6828
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6829 /* NOTE: Without sufficient checks for stream frames, we got weird
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6830 crashes in pdump. These came and went very easily -- adding the
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6831 critical-section code for redisplay was enough to trigger them.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6832 Perhaps I should have debugged them but there didn't seem to be any
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6833 point. --ben */
1279
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6834 if (FRAME_STREAM_P (f)) /* nothing to do */
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6835 return 0;
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6836
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6837 /* Reentrancy into redisplay can be deadly. See stack trace above
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6838 generate_displayable_area(). */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6839 if (in_display)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6840 return 1;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6841
545
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6842 if (preemption_check
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6843 && !DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6844 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6845 /* The preemption check itself takes a lot of time,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6846 so normally don't do it here. We do it if called
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6847 from Lisp, though (`redisplay-frame'). */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6848 int preempted;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6849
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6850 REDISPLAY_PREEMPTION_CHECK;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6851 if (preempted)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6852 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6853 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6854
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6855 if (!internal_equal (f->old_buffer_alist, f->buffer_alist, 0))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6856 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6857 Lisp_Object frame;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6858
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6859 f->old_buffer_alist = Freplace_list (f->old_buffer_alist,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6860 f->buffer_alist);
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
6861 frame = wrap_frame (f);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6862 va_run_hook_with_args (Qbuffer_list_changed_hook, 1, frame);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6863 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6864
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6865 /* Before we put a hold on frame size changes, attempt to process
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6866 any which are already pending. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6867 if (f->size_change_pending)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6868 change_frame_size (f, f->new_height, f->new_width, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6869
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6870 /* If frame size might need to be changed, due to changed size
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6871 of toolbars, scrollbars etc, change it now */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6872 if (f->size_slipped)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6873 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6874 adjust_frame_size (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6875 assert (!f->size_slipped);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6876 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6877
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6878 /* The menubar, toolbar, and icon updates should be done before
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6879 enter_redisplay_critical_section is called and we are officially
3025
facf3239ba30 [xemacs-hg @ 2005-10-25 11:16:19 by ben]
ben
parents: 2552
diff changeset
6880 `in_display'. They is because they tend to eval Lisp code, which
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6881 needs to be carefully wrapped within the critical section (and hence
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6882 is difficult to debug). */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6883
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6884 #ifdef HAVE_MENUBARS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6885 /* Update the menubar. It is done first since it could change
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6886 the menubar's visibility. This way we avoid having flashing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6887 caused by an Expose event generated by the visibility change
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6888 being handled. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6889 update_frame_menubars (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6890 #endif /* HAVE_MENUBARS */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6891 #ifdef HAVE_TOOLBARS
905
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6892 /* Update the toolbars geometry. We don't update the toolbars
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6893 themselves at this point since the space they are trying to
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6894 occupy may currently by occupied by gutter elements. Instead we
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6895 update the geometry, then update the gutter geometry, then update
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6896 the gutters - which will cause mapped windows to be repositioned
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6897 - and finally update the toolbars. */
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6898 update_frame_toolbars_geometry (f);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6899 #endif /* HAVE_TOOLBARS */
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6900 /* Gutter update proper has to be done inside display when no frame
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6901 size changes can occur, thus we separately update the gutter
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6902 geometry here if it needs it. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6903 update_frame_gutter_geometry (f);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6904
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6905 /* If we clear the frame we have to force its contents to be redrawn. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6906 if (f->clear)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6907 f->frame_changed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6908
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6909 /* Invalidate the subwindow caches. We use subwindows_changed here
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6910 to cause subwindows to get instantiated. This is because
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6911 subwindows_state_changed is less strict - dealing with things
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6912 like the clicked state of button. We have to do this before
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6913 redisplaying the gutters as subwindows get unmapped in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6914 process.*/
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6915 if (f->frame_changed)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6916 reset_frame_subwindow_instance_cache (f);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6917
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6918 if (f->frame_changed || f->subwindows_changed)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6919 {
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6920 /* we have to do this so the gutter gets regenerated. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6921 reset_gutter_display_lines (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6922 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6923
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6924 depth = enter_redisplay_critical_section ();
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6925
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6926 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6927
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6928 /* See comments in enter_redisplay_critical_section() */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6929
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6930 MAYBE_DEVMETH (d, frame_output_begin, (f));
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6931
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6932 /* We can now update the gutters, safe in the knowledge that our
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6933 efforts won't get undone. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6934
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6935 /* This can call lisp, but redisplay is protected by binding
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6936 inhibit_quit. More importantly the code involving display lines
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6937 *assumes* that GC will not happen and so does not GCPRO
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6938 anything. Since we use this code the whole time with the gutters
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6939 we cannot allow GC to happen when manipulating the gutters.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6940
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6941 This must be inside of the critical section for various reasons.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6942 For example, it messes with display structures, which be left in
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6943 an inconsistent state. */
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6944 update_frame_gutters (f);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6945
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6946 /* Erase the frame before outputting its contents. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6947 if (f->clear)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6948 {
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6949 MAYBE_DEVMETH (d, clear_frame, (f));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6950 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6951
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6952 /* Do the selected window first. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6953 redisplay_window (FRAME_SELECTED_WINDOW (f), 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6954
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6955 /* Then do the rest. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6956 redisplay_windows (f->root_window, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6957
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6958 MAYBE_DEVMETH (d, frame_output_end, (f));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6959
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6960 update_frame_title (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6961
905
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6962 #ifdef HAVE_TOOLBARS
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6963 /* Finally update the toolbars. It seems its possible to get in a
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6964 cycle between updating the gutter and the toolbars. Basically we
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6965 want to end up with both being up-to-date and this doesn't seem
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6966 possible in a single pass. */
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6967 update_frame_toolbars (f);
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6968 #endif /* HAVE_TOOLBARS */
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6969
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6970 CLASS_RESET_CHANGED_FLAGS (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6971 f->window_face_cache_reset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6972 f->echo_area_garbaged = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6973 f->clear = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6974
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6975 if (!f->size_change_pending)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6976 f->size_changed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6977
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6978 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6979
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6980 /* Allow frame size changes to occur again. */
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6981 exit_redisplay_critical_section (depth);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6982
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6983 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6984 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6985
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6986 /* Ensure that all frames on the given device are correctly displayed.
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6987 If AUTOMATIC is non-zero, and the device implementation indicates
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6988 no automatic redisplay, as printers do, then the device is not
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6989 redisplayed. AUTOMATIC is set to zero when called from lisp
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6990 functions (redraw-device) and (redisplay-device), and to non-zero
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6991 when called from "lazy" redisplay();
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6992 */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6993
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6994 static int
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6995 redisplay_device (struct device *d, int automatic)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6996 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6997 Lisp_Object frame, frmcons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6998 int size_change_failed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6999 struct frame *f;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7000
545
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7001 if (automatic && DEVICE_IMPL_FLAG (d, XDEVIMPF_NO_AUTO_REDISPLAY))
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
7002 return 0;
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
7003
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7004 if (DEVICE_STREAM_P (d)) /* nothing to do */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7005 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7006
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7007 /* It is possible that redisplay has been called before the
545
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7008 device is fully initialized, or that the console implementation
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7009 allows frameless devices. If so then continue with the next
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7010 device. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7011 if (NILP (DEVICE_SELECTED_FRAME (d)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7012 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7013
545
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7014 if (!DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY))
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7015 {
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7016 int preempted;
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7017 REDISPLAY_PREEMPTION_CHECK;
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7018 if (preempted)
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7019 return 1;
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7020 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7021
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7022 /* Always do the selected frame first. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7023 frame = DEVICE_SELECTED_FRAME (d);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7024
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7025 f = XFRAME (frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7026
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7027 if (f->icon_changed || f->windows_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7028 update_frame_icon (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7029
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7030 if (FRAME_REPAINT_P (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7031 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7032 if (CLASS_REDISPLAY_FLAGS_CHANGEDP(f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7033 {
588
ed8e2ee8d29d [xemacs-hg @ 2001-05-31 00:30:39 by kkm]
kkm
parents: 563
diff changeset
7034 int preempted = redisplay_frame (f, 1);
545
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7035 if (preempted)
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7036 return 1;
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7037 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7038
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7039 /* If the frame redisplay did not get preempted, then this flag
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7040 should have gotten set to 0. It might be possible for that
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7041 not to happen if a size change event were to occur at an odd
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7042 time. To make sure we don't miss anything we simply don't
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7043 reset the top level flags until the condition ends up being
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7044 in the right state. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7045 if (f->size_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7046 size_change_failed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7047 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7048
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7049 DEVICE_FRAME_LOOP (frmcons, d)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7050 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7051 f = XFRAME (XCAR (frmcons));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7052
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7053 if (f == XFRAME (DEVICE_SELECTED_FRAME (d)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7054 continue;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7055
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7056 if (f->icon_changed || f->windows_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7057 update_frame_icon (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7058
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7059 if (FRAME_REPAINT_P (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7060 {
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
7061 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7062 {
588
ed8e2ee8d29d [xemacs-hg @ 2001-05-31 00:30:39 by kkm]
kkm
parents: 563
diff changeset
7063 int preempted = redisplay_frame (f, 1);
545
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7064 if (preempted)
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7065 return 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7066 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7067
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7068 if (f->size_change_pending)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7069 size_change_failed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7070 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7071 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7072
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7073 /* If we get here then we redisplayed all of our frames without
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7074 getting preempted so mark ourselves as clean. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7075 CLASS_RESET_CHANGED_FLAGS (d);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7076
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7077 if (!size_change_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7078 d->size_changed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7079
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7080 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7081 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7082
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7083 /* Ensure that all windows on all frames on all devices are displaying
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7084 the current contents of their respective buffers. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7085
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7086 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7087 redisplay_without_hooks (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7088 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7089 Lisp_Object devcons, concons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7090 int size_change_failed = 0;
1292
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
7091 PROFILE_DECLARE ();
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
7092
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
7093 PROFILE_RECORD_ENTERING_SECTION (QSin_redisplay);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7094
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7095 if (asynch_device_change_pending)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7096 handle_asynch_device_change ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7097
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7098 if (!GLOBAL_REDISPLAY_FLAGS_CHANGEDP &&
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
7099 !disable_preemption && preemption_count < max_preempts)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7100 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7101
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7102 DEVICE_LOOP_NO_BREAK (devcons, concons)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7103 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7104 struct device *d = XDEVICE (XCAR (devcons));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7105 int preempted;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7106
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
7107 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (d))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7108 {
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
7109 preempted = redisplay_device (d, 1);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7110
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7111 if (preempted)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7112 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7113 preemption_count++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7114 RESET_CHANGED_SET_FLAGS;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7115 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7116 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7117
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7118 /* See comment in redisplay_device. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7119 if (d->size_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7120 size_change_failed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7121 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7122 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7123 preemption_count = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7124
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7125 /* Mark redisplay as accurate */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7126 GLOBAL_RESET_CHANGED_FLAGS;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7127 RESET_CHANGED_SET_FLAGS;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7128
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7129 if (faces_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7130 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7131 mark_all_faces_as_clean ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7132 faces_changed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7133 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7134
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7135 if (!size_change_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7136 size_changed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7137
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7138 reset_buffer_changes ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7139
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7140 done:
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
7141 #ifdef ERROR_CHECK_DISPLAY
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
7142 sledgehammer_check_redisplay_structs ();
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
7143 #endif /* ERROR_CHECK_DISPLAY */
1292
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
7144
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
7145 PROFILE_RECORD_EXITING_SECTION (QSin_redisplay);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7146 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7147
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
7148 /* Note: All places in the C code that call redisplay() are prepared to
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
7149 handle GCing, which can happen from run_pre_idle_hook(). However, we
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
7150 can't currently handle GC inside the guts of redisplay; see
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
7151 enter_redisplay_critical_section().
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7152
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7153 (#### What about other external entry points to the redisplay code?
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7154 Someone should go through and make sure that all callers can handle
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7155 GC there, too.)
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7156 */
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7157
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7158 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7159 redisplay (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7160 {
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7161 run_pre_idle_hook ();
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7162 redisplay_no_pre_idle_hook ();
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7163 }
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7164
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7165 void
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7166 redisplay_no_pre_idle_hook (void)
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7167 {
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7168 if (last_display_warning_tick != display_warning_tick &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7169 !inhibit_warning_display)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7170 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7171 /* If an error occurs during this function, oh well.
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7172 If we report another warning, we could get stuck in an
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7173 infinite loop reporting warnings. */
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7174 call0_trapping_problems
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7175 (0, Qdisplay_warning_buffer,
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7176 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7177 last_display_warning_tick = display_warning_tick;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7178 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7179
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7180 redisplay_without_hooks ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7181 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7182
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7183 Lisp_Object
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7184 eval_within_redisplay (Lisp_Object dont_trust_this_damn_sucker)
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7185 {
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7186 return
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7187 eval_in_buffer_trapping_problems
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7188 ("Error calling function within redisplay", current_buffer,
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
7189 dont_trust_this_damn_sucker, 0);
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7190 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7191
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7192 /* Efficiently determine the window line number, and return a pointer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7193 to its printed representation. Do this regardless of whether
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7194 line-number-mode is on. The first line in the buffer is counted as
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7195 1. If narrowing is in effect, the lines are counted from the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7196 beginning of the visible portion of the buffer. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7197 static char *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7198 window_line_number (struct window *w, int type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7199 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7200 struct device *d = XDEVICE (XFRAME (w->frame)->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7201 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7202 /* Be careful in the order of these tests. The first clause will
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7203 fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7204 This can occur when the frame title is computed really early */
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7205 Charbpos pos =
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7206 ((EQ(DEVICE_SELECTED_FRAME(d), w->frame) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7207 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame(d)))) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7208 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7209 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d )
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7210 ? BUF_PT (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7211 : marker_position (w->pointm[type]));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7212 EMACS_INT line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7213
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7214 line = buffer_line_number (b, pos, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7215
603
1c880911c386 [xemacs-hg @ 2001-06-01 08:23:09 by martinb]
martinb
parents: 588
diff changeset
7216 {
1c880911c386 [xemacs-hg @ 2001-06-01 08:23:09 by martinb]
martinb
parents: 588
diff changeset
7217 static char window_line_number_buf[DECIMAL_PRINT_SIZE (long)];
1c880911c386 [xemacs-hg @ 2001-06-01 08:23:09 by martinb]
martinb
parents: 588
diff changeset
7218
1c880911c386 [xemacs-hg @ 2001-06-01 08:23:09 by martinb]
martinb
parents: 588
diff changeset
7219 long_to_string (window_line_number_buf, line + 1);
1c880911c386 [xemacs-hg @ 2001-06-01 08:23:09 by martinb]
martinb
parents: 588
diff changeset
7220
1c880911c386 [xemacs-hg @ 2001-06-01 08:23:09 by martinb]
martinb
parents: 588
diff changeset
7221 return window_line_number_buf;
1c880911c386 [xemacs-hg @ 2001-06-01 08:23:09 by martinb]
martinb
parents: 588
diff changeset
7222 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7223 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7224
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7225
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7226 /* Given a character representing an object in a modeline
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7227 specification, return a string (stored into the global array
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7228 `mode_spec_ibyte_string') with the information that object
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7229 represents.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7230
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7231 This function is largely unchanged from previous versions of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7232 redisplay engine.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7233
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7234 Warning! This code is also used for frame titles and can be called
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7235 very early in the device/frame update process! JV
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7236 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7237
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7238 static void
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7239 decode_mode_spec (struct window *w, Ichar spec, int type)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7240 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7241 Lisp_Object obj = Qnil;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7242 const char *str = NULL;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7243 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7244
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7245 Dynarr_reset (mode_spec_ibyte_string);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7246
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7247 switch (spec)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7248 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7249 /* print buffer name */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7250 case 'b':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7251 obj = b->name;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7252 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7253
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7254 /* print visited file name */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7255 case 'f':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7256 obj = b->filename;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7257 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7258
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7259 /* print the current column */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7260 case 'c':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7261 {
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7262 Charbpos pt = (w == XWINDOW (Fselected_window (Qnil)))
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7263 ? BUF_PT (b)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7264 : marker_position (w->pointm[type]);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7265 int col = column_at_point (b, pt, 1) + !!column_number_start_at_one;
603
1c880911c386 [xemacs-hg @ 2001-06-01 08:23:09 by martinb]
martinb
parents: 588
diff changeset
7266 char buf[DECIMAL_PRINT_SIZE (long)];
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7267
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7268 long_to_string (buf, col);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7269
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7270 Dynarr_add_many (mode_spec_ibyte_string,
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7271 (const Ibyte *) buf, strlen (buf));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7272
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7273 goto decode_mode_spec_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7274 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7275 /* print the file coding system */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7276 case 'C':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7277 {
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7278 Lisp_Object codesys = b->buffer_file_coding_system;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7279 /* Be very careful here not to get an error. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7280 if (NILP (codesys) || SYMBOLP (codesys) || CODING_SYSTEMP (codesys))
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7281 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7282 codesys = find_coding_system_for_text_file (codesys, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7283 if (CODING_SYSTEMP (codesys))
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7284 obj = XCODING_SYSTEM_MNEMONIC (codesys);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7285 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7286 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7287 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7288
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7289 /* print the current line number */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7290 case 'l':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7291 str = window_line_number (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7292 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7293
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7294 /* print value of mode-name (obsolete) */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7295 case 'm':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7296 obj = b->mode_name;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7297 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7298
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7299 /* print hyphen and frame number, if != 1 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7300 case 'N':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7301 #ifdef HAVE_TTY
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7302 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7303 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7304 if (FRAME_TTY_P (f) && f->order_count > 1 && f->order_count <= 99999999)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7305 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7306 /* Naughty, naughty */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7307 char * writable_str = alloca_array (char, 10);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7308 sprintf (writable_str, "-%d", f->order_count);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7309 str = writable_str;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7310 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7311 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7312 #endif /* HAVE_TTY */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7313 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7314
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7315 /* print Narrow if appropriate */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7316 case 'n':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7317 if (BUF_BEGV (b) > BUF_BEG (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7318 || BUF_ZV (b) < BUF_Z (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7319 str = " Narrow";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7320 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7321
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7322 /* print %, * or hyphen, if buffer is read-only, modified or neither */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7323 case '*':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7324 str = (!NILP (b->read_only)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7325 ? "%"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7326 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7327 ? "*"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7328 : "-"));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7329 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7330
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7331 /* print * or hyphen -- XEmacs change to allow a buffer to be
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7332 read-only but still indicate whether it is modified. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7333 case '+':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7334 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7335 ? "*"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7336 : (!NILP (b->read_only)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7337 ? "%"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7338 : "-"));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7339 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7340
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7341 /* #### defined in 19.29 decode_mode_spec, but not in
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7342 modeline-format doc string. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7343 /* This differs from %* in that it ignores read-only-ness. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7344 case '&':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7345 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7346 ? "*"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7347 : "-");
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7348 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7349
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7350 /* print process status */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7351 case 's':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7352 obj = Fget_buffer_process (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7353 if (NILP (obj))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7354 str = GETTEXT ("no process");
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7355 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7356 obj = Fsymbol_name (Fprocess_status (obj));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7357 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7358
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7359 /* Print name of selected frame. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7360 case 'S':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7361 obj = XFRAME (w->frame)->name;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7362 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7363
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7364 /* indicate TEXT or BINARY */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7365 case 't':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7366 /* #### NT does not use this any more. Now what? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7367 str = "T";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7368 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7369
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7370 /* print percent of buffer above top of window, or Top, Bot or All */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7371 case 'p':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7372 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7373 Charbpos pos = marker_position (w->start[type]);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7374
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7375 /* This had better be while the desired lines are being done. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7376 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7377 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7378 if (pos <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7379 str = "All";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7380 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7381 str = "Bottom";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7382 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7383 else if (pos <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7384 str = "Top";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7385 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7386 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7387 /* This hard limit is ok since the string it will hold has a
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7388 fixed maximum length of 3. But just to be safe... */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7389 char buf[10];
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7390 Charcount chars = pos - BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7391 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7392
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7393 /* Avoid overflow on big buffers */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7394 int percent = total > LONG_MAX/200 ?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7395 (chars + total/200) / (total / 100) :
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7396 (chars * 100 + total/2) / total;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7397
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7398 /* We can't normally display a 3-digit number, so get us a
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7399 2-digit number that is close. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7400 if (percent == 100)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7401 percent = 99;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7402
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7403 sprintf (buf, "%d%%", percent);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7404 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7405 strlen (buf));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7406
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7407 goto decode_mode_spec_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7408 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7409 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7410 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7411
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7412 /* print percent of buffer above bottom of window, perhaps plus
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7413 Top, or print Bottom or All */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7414 case 'P':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7415 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7416 Charbpos toppos = marker_position (w->start[type]);
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7417 Charbpos botpos = BUF_Z (b) - w->window_end_pos[type];
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7418
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7419 /* botpos is only accurate as of the last redisplay, so we can
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7420 only treat it as a hint. In particular, after erase-buffer,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7421 botpos may be negative. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7422 if (botpos < toppos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7423 botpos = toppos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7424
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7425 if (botpos >= BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7426 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7427 if (toppos <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7428 str = "All";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7429 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7430 str = "Bottom";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7431 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7432 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7433 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7434 /* This hard limit is ok since the string it will hold has a
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7435 fixed maximum length of around 6. But just to be safe... */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7436 char buf[10];
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7437 Charcount chars = botpos - BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7438 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7439
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7440 /* Avoid overflow on big buffers */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7441 int percent = total > LONG_MAX/200 ?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7442 (chars + total/200) / (total / 100) :
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7443 (chars * 100 + total/2) / max (total, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7444
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7445 /* We can't normally display a 3-digit number, so get us a
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7446 2-digit number that is close. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7447 if (percent == 100)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7448 percent = 99;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7449
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7450 if (toppos <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7451 sprintf (buf, "Top%d%%", percent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7452 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7453 sprintf (buf, "%d%%", percent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7454
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7455 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7456 strlen (buf));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7457
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7458 goto decode_mode_spec_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7459 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7460 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7461 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7462
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7463 /* print % */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7464 case '%':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7465 str = "%";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7466 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7467
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7468 /* print one [ for each recursive editing level. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7469 case '[':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7470 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7471 int i;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7472
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7473 if (command_loop_level > 5)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7474 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7475 str = "[[[... ";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7476 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7477 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7478
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7479 for (i = 0; i < command_loop_level; i++)
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7480 Dynarr_add (mode_spec_ibyte_string, '[');
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7481
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7482 goto decode_mode_spec_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7483 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7484
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7485 /* print one ] for each recursive editing level. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7486 case ']':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7487 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7488 int i;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7489
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7490 if (command_loop_level > 5)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7491 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7492 str = "...]]]";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7493 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7494 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7495
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7496 for (i = 0; i < command_loop_level; i++)
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7497 Dynarr_add (mode_spec_ibyte_string, ']');
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7498
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7499 goto decode_mode_spec_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7500 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7501
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7502 /* print infinitely many dashes -- handle at top level now */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7503 case '-':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7504 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7505
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7506 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7507
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7508 if (STRINGP (obj))
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7509 Dynarr_add_many (mode_spec_ibyte_string,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7510 XSTRING_DATA (obj),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7511 XSTRING_LENGTH (obj));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7512 else if (str)
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7513 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) str, strlen (str));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7514
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7515 decode_mode_spec_done:
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7516 Dynarr_add (mode_spec_ibyte_string, '\0');
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7517 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7518
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7519 /* Given a display line, free all of its data structures. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7520
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7521 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7522 free_display_line (struct display_line *dl)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7523 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7524 int block;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7525
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7526 if (dl->display_blocks)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7527 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7528 for (block = 0; block < Dynarr_largest (dl->display_blocks); block++)
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7529 {
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7530 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7531
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7532 Dynarr_free (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7533 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7534
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7535 Dynarr_free (dl->display_blocks);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7536 dl->display_blocks = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7537 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7538
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7539 if (dl->left_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7540 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7541 Dynarr_free (dl->left_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7542 dl->left_glyphs = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7543 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7544
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7545 if (dl->right_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7546 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7547 Dynarr_free (dl->right_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7548 dl->right_glyphs = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7549 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7550 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7551
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7552
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7553 /* Given an array of display lines, free them and all data structures
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7554 contained within them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7555
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7556 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7557 free_display_lines (display_line_dynarr *dla)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7558 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7559 int line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7560
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7561 for (line = 0; line < Dynarr_largest (dla); line++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7562 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7563 free_display_line (Dynarr_atp (dla, line));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7564 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7565
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7566 Dynarr_free (dla);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7567 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7568
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7569 /* Call internal free routine for each set of display lines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7570
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7571 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7572 free_display_structs (struct window_mirror *mir)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7573 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7574 if (mir->current_display_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7575 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7576 free_display_lines (mir->current_display_lines);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7577 mir->current_display_lines = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7578 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7579
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7580 if (mir->desired_display_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7581 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7582 free_display_lines (mir->desired_display_lines);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7583 mir->desired_display_lines = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7584 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7585 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7586
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7587
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7588 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7589 mark_glyph_block_dynarr (glyph_block_dynarr *gba)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7590 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7591 if (gba)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7592 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7593 glyph_block *gb = Dynarr_atp (gba, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7594 glyph_block *gb_last = Dynarr_atp (gba, Dynarr_length (gba));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7595
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7596 for (; gb < gb_last; gb++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7597 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7598 if (!NILP (gb->glyph))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7599 mark_object (gb->glyph);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7600 if (!NILP (gb->extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7601 mark_object (gb->extent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7602 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7603 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7604 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7605
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7606 /* See the comment in image_instantiate_cache_result as to why marking
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7607 the glyph will also mark the image_instance. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7608 void
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7609 mark_redisplay_structs (display_line_dynarr *dla)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7610 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7611 display_line *dl = Dynarr_atp (dla, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7612 display_line *dl_last = Dynarr_atp (dla, Dynarr_length (dla));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7613
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7614 for (; dl < dl_last; dl++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7615 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7616 display_block_dynarr *dba = dl->display_blocks;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7617 display_block *db = Dynarr_atp (dba, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7618 display_block *db_last = Dynarr_atp (dba, Dynarr_length (dba));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7619
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7620 for (; db < db_last; db++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7621 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7622 rune_dynarr *ra = db->runes;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7623 rune *r = Dynarr_atp (ra, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7624 rune *r_last = Dynarr_atp (ra, Dynarr_length (ra));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7625
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7626 for (; r < r_last; r++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7627 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7628 if (r->type == RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7629 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7630 if (!NILP (r->object.dglyph.glyph))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7631 mark_object (r->object.dglyph.glyph);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7632 if (!NILP (r->object.dglyph.extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7633 mark_object (r->object.dglyph.extent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7634 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7635 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7636 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7637
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7638 mark_glyph_block_dynarr (dl->left_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7639 mark_glyph_block_dynarr (dl->right_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7640 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7641 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7642
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7643
2367
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
7644
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
7645 /*
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
7646
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
7647 Info on line-start cache:
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
7648
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
7649 (Info-goto-node "(internals)Line Start Cache")
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
7650 */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7651
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7652 /* This will get used quite a bit so we don't want to be constantly
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7653 allocating and freeing it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7654 static line_start_cache_dynarr *internal_cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7655
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7656 /* Makes internal_cache represent the TYPE display structs and only
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7657 the TYPE display structs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7658
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7659 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7660 update_internal_cache_list (struct window *w, int type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7661 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7662 int line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7663 display_line_dynarr *dla = window_display_lines (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7664
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7665 Dynarr_reset (internal_cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7666 for (line = 0; line < Dynarr_length (dla); line++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7667 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7668 struct display_line *dl = Dynarr_atp (dla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7669
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7670 if (dl->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7671 continue;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7672 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7673 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7674 struct line_start_cache lsc;
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
7675
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
7676 lsc.start = dl->charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
7677 lsc.end = dl->end_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7678 lsc.height = dl->ascent + dl->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7679
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7680 Dynarr_add (internal_cache, lsc);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7681 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7682 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7683 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7684
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7685 /* Reset the line cache if necessary. This should be run at the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7686 beginning of any function which access the cache. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7687
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7688 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7689 validate_line_start_cache (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7690 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7691 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7692 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7693
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7694 if (!w->line_cache_validation_override)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7695 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7696 /* f->extents_changed used to be in here because extent face and
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7697 size changes can cause text shifting. However, the extent
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7698 covering the region is constantly having its face set and
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7699 priority altered by the mouse code. This means that the line
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7700 start cache is constantly being invalidated. This is bad
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7701 since the mouse code also triggers heavy usage of the cache.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7702 Since it is an unlikely that f->extents being changed
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7703 indicates that the cache really needs to be updated and if it
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7704 does redisplay will catch it pretty quickly we no longer
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7705 invalidate the cache if it is set. This greatly speeds up
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7706 dragging out regions with the mouse. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7707 if (XINT (w->line_cache_last_updated) < BUF_MODIFF (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7708 || f->faces_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7709 || f->clip_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7710 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7711 Dynarr_reset (w->line_start_cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7712 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7713 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7714 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7715
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7716 /* Return the very first buffer position contained in the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7717 window's cache, or -1 if the cache is empty. Assumes that the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7718 cache is valid. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7719
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7720 static Charbpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7721 line_start_cache_start (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7722 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7723 line_start_cache_dynarr *cache = w->line_start_cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7724
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7725 if (!Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7726 return -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7727 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7728 return Dynarr_atp (cache, 0)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7729 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7730
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7731 /* Return the very last buffer position contained in the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7732 window's cache, or -1 if the cache is empty. Assumes that the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7733 cache is valid. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7734
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7735 static Charbpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7736 line_start_cache_end (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7737 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7738 line_start_cache_dynarr *cache = w->line_start_cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7739
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7740 if (!Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7741 return -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7742 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7743 return Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7744 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7745
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7746 /* Return the index of the line POINT is contained within in window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7747 W's line start cache. It will enlarge the cache or move the cache
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7748 window in order to have POINT be present in the cache. MIN_PAST is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7749 a guarantee of the number of entries in the cache present on either
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7750 side of POINT (unless a buffer boundary is hit). If MIN_PAST is -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7751 then it will be treated as 0, but the cache window will not be
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7752 allowed to shift. Returns -1 if POINT cannot be found in the cache
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7753 for any reason. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7754
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7755 int
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7756 point_in_line_start_cache (struct window *w, Charbpos point, int min_past)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7757 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7758 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7759 line_start_cache_dynarr *cache = w->line_start_cache;
647
b39c14581166 [xemacs-hg @ 2001-08-13 04:45:47 by ben]
ben
parents: 638
diff changeset
7760 int top, bottom, pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7761
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7762 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7763 w->line_cache_validation_override++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7764
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7765 /* Let functions pass in negative values, but we still treat -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7766 specially. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7767 /* #### bogosity alert */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7768 if (min_past < 0 && min_past != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7769 min_past = -min_past;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7770
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7771 if (!Dynarr_length (cache) || line_start_cache_start (w) > point
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7772 || line_start_cache_end (w) < point)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7773 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7774 int loop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7775 int win_char_height = window_char_height (w, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7776
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7777 /* Occasionally we get here with a 0 height
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7778 window. find_next_newline_no_quit will abort if we pass it a
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7779 count of 0 so handle that case. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7780 if (!win_char_height)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7781 win_char_height = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7782
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7783 if (!Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7784 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7785 Charbpos from = find_next_newline_no_quit (b, point, -1);
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7786 Charbpos to = find_next_newline_no_quit (b, from, win_char_height);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7787
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7788 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7789
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7790 if (!Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7791 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7792 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7793 return -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7794 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7795 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7796
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7797 assert (Dynarr_length (cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7798
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7799 loop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7800 while (line_start_cache_start (w) > point
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7801 && (loop < cache_adjustment || min_past == -1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7802 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7803 Charbpos from, to;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7804
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7805 from = line_start_cache_start (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7806 if (from <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7807 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7808
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7809 from = find_next_newline_no_quit (b, from, -win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7810 to = line_start_cache_end (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7811
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7812 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7813 loop++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7814 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7815
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7816 if (line_start_cache_start (w) > point)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7817 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7818 Charbpos from, to;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7819
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7820 from = find_next_newline_no_quit (b, point, -1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7821 if (from >= BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7822 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7823 to = find_next_newline_no_quit (b, from, -win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7824 from = to;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7825 to = BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7826 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7827 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7828 to = find_next_newline_no_quit (b, from, win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7829
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7830 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7831 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7832
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7833 loop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7834 while (line_start_cache_end (w) < point
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7835 && (loop < cache_adjustment || min_past == -1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7836 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7837 Charbpos from, to;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7838
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7839 to = line_start_cache_end (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7840 if (to >= BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7841 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7842
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7843 from = line_start_cache_end (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7844 to = find_next_newline_no_quit (b, from, win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7845
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7846 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7847 loop++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7848 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7849
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7850 if (line_start_cache_end (w) < point)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7851 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7852 Charbpos from, to;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7853
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7854 from = find_next_newline_no_quit (b, point, -1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7855 if (from >= BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7856 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7857 to = find_next_newline_no_quit (b, from, -win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7858 from = to;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7859 to = BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7860 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7861 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7862 to = find_next_newline_no_quit (b, from, win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7863
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7864 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7865 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7866 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7867
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7868 assert (Dynarr_length (cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7869
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7870 if (min_past == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7871 min_past = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7872
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7873 /* This could happen if the buffer is narrowed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7874 if (line_start_cache_start (w) > point
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7875 || line_start_cache_end (w) < point)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7876 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7877 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7878 return -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7879 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7880
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7881 find_point_loop:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7882
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7883 top = Dynarr_length (cache) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7884 bottom = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7885
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7886 while (1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7887 {
647
b39c14581166 [xemacs-hg @ 2001-08-13 04:45:47 by ben]
ben
parents: 638
diff changeset
7888 int new_pos;
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7889 Charbpos start, end;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7890
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7891 pos = (bottom + top + 1) >> 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7892 start = Dynarr_atp (cache, pos)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7893 end = Dynarr_atp (cache, pos)->end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7894
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7895 if (point >= start && point <= end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7896 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7897 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7898 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7899 Charbpos from =
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7900 find_next_newline_no_quit (b, line_start_cache_start (w),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7901 -min_past - 1);
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7902 Charbpos to = line_start_cache_end (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7903
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7904 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7905 goto find_point_loop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7906 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7907 else if ((Dynarr_length (cache) - pos - 1) < min_past
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7908 && line_start_cache_end (w) < BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7909 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7910 Charbpos from = line_start_cache_end (w);
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7911 Charbpos to = find_next_newline_no_quit (b, from,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7912 (min_past
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7913 ? min_past
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7914 : 1));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7915
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7916 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7917 goto find_point_loop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7918 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7919 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7920 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7921 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7922 return pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7923 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7924 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7925 else if (point > end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7926 bottom = pos + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7927 else if (point < start)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7928 top = pos - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7929 else
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
7930 ABORT ();
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7931
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7932 new_pos = (bottom + top + 1) >> 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7933 if (pos == new_pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7934 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7935 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7936 return -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7937 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7938 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7939 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7940
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7941 /* Return a boolean indicating if POINT would be visible in window W
1708
a19b0eb5dfc1 [xemacs-hg @ 2003-09-22 04:21:42 by james]
james
parents: 1320
diff changeset
7942 if display of the window was to begin at STARTP. If PARTIALLY is
a19b0eb5dfc1 [xemacs-hg @ 2003-09-22 04:21:42 by james]
james
parents: 1320
diff changeset
7943 zero, then if POINT has fewer visible pixels than the window clip,
a19b0eb5dfc1 [xemacs-hg @ 2003-09-22 04:21:42 by james]
james
parents: 1320
diff changeset
7944 0 is returned; otherwise, 1 is returned if POINT has any visible
a19b0eb5dfc1 [xemacs-hg @ 2003-09-22 04:21:42 by james]
james
parents: 1320
diff changeset
7945 pixels. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7946 int
1708
a19b0eb5dfc1 [xemacs-hg @ 2003-09-22 04:21:42 by james]
james
parents: 1320
diff changeset
7947 point_would_be_visible (struct window *w, Charbpos startp, Charbpos point,
a19b0eb5dfc1 [xemacs-hg @ 2003-09-22 04:21:42 by james]
james
parents: 1320
diff changeset
7948 int partially)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7949 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7950 struct buffer *b = XBUFFER (w->buffer);
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
7951 int pixpos = -WINDOW_TEXT_TOP_CLIP(w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7952 int bottom = WINDOW_TEXT_HEIGHT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7953 int start_elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7954
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7955 /* If point is before the intended start it obviously can't be visible. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7956 if (point < startp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7957 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7958
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7959 /* If point or start are not in the accessible buffer range, then
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7960 fail. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7961 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7962 || point < BUF_BEGV (b) || point > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7963 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7964
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7965 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7966 w->line_cache_validation_override++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7967
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7968 start_elt = point_in_line_start_cache (w, startp, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7969 if (start_elt == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7970 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7971 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7972 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7973 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7974
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7975 assert (line_start_cache_start (w) <= startp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7976 && line_start_cache_end (w) >= startp);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7977
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7978 while (1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7979 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7980 int height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7981
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7982 /* Expand the cache if necessary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7983 if (start_elt == Dynarr_length (w->line_start_cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7984 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7985 Charbpos old_startp =
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7986 Dynarr_atp (w->line_start_cache, start_elt - 1)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7987
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7988 start_elt = point_in_line_start_cache (w, old_startp,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7989 window_char_height (w, 0));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7990
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7991 /* We've already actually processed old_startp, so increment
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7992 immediately. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7993 start_elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7994
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7995 /* If this happens we didn't add any extra elements. Bummer. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7996 if (start_elt == Dynarr_length (w->line_start_cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7997 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7998 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7999 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8000 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8001 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8002
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8003 height = Dynarr_atp (w->line_start_cache, start_elt)->height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8004
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8005 if (pixpos + height > bottom)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8006 {
1708
a19b0eb5dfc1 [xemacs-hg @ 2003-09-22 04:21:42 by james]
james
parents: 1320
diff changeset
8007 if (bottom - pixpos < (partially ? 0 : VERTICAL_CLIP (w, 0)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8008 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8009 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8010 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8011 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8012 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8013
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8014 pixpos += height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8015 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8016 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8017 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8018 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8019 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8020
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8021 start_elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8022 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8023 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8024
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8025 /* For the given window W, if display starts at STARTP, what will be
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8026 the buffer position at the beginning or end of the last line
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8027 displayed. The end of the last line is also know as the window end
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8028 position.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8029
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8030 WARNING: It is possible that redisplay failed to layout any lines for the
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8031 windows. Under normal circumstances this is rare. However it seems that it
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8032 does occur in the following situation: A mouse event has come in and we
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8033 need to compute its location in a window. That code (in
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8034 pixel_to_glyph_translation) already can handle 0 as an error return value.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8035
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8036 #### With a little work this could probably be reworked as just a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8037 call to start_with_line_at_pixpos. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8038
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8039 static Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8040 start_end_of_last_line (struct window *w, Charbpos startp, int end,
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8041 int may_error)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8042 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8043 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8044 line_start_cache_dynarr *cache = w->line_start_cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8045 int pixpos = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8046 int bottom = WINDOW_TEXT_HEIGHT (w);
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8047 Charbpos cur_start;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8048 int start_elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8049
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8050 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8051 w->line_cache_validation_override++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8052
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8053 if (startp < BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8054 startp = BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8055 else if (startp > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8056 startp = BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8057 cur_start = startp;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8058
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8059 start_elt = point_in_line_start_cache (w, cur_start, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8060 if (start_elt == -1)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8061 return may_error ? 0 : startp;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8062
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8063 while (1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8064 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8065 int height = Dynarr_atp (cache, start_elt)->height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8066
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8067 cur_start = Dynarr_atp (cache, start_elt)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8068
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8069 if (pixpos + height > bottom)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8070 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8071 /* Adjust for any possible clip. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8072 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8073 start_elt--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8074
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8075 if (start_elt < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8076 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8077 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8078 if (end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8079 return BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8080 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8081 return BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8082 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8083 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8084 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8085 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8086 if (end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8087 return Dynarr_atp (cache, start_elt)->end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8088 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8089 return Dynarr_atp (cache, start_elt)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8090 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8091 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8092
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8093 pixpos += height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8094 start_elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8095 if (start_elt == Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8096 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8097 Charbpos from = line_start_cache_end (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8098 int win_char_height = window_char_height (w, 0);
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8099 Charbpos to = find_next_newline_no_quit (b, from,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8100 (win_char_height
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8101 ? win_char_height
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8102 : 1));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8103
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8104 /* We've hit the end of the bottom so that's what it is. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8105 if (from >= BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8106 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8107 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8108 return BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8109 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8110
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8111 update_line_start_cache (w, from, to, BUF_PT (b), 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8112
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8113 /* Updating the cache invalidates any current indexes. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8114 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8115 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8116 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8117 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8118
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8119 /* For the given window W, if display starts at STARTP, what will be
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8120 the buffer position at the beginning of the last line displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8121
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8122 Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8123 start_of_last_line (struct window *w, Charbpos startp)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8124 {
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8125 return start_end_of_last_line (w, startp, 0 , 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8126 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8127
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8128 /* For the given window W, if display starts at STARTP, what will be
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8129 the buffer position at the end of the last line displayed. This is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8130 also know as the window end position. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8131
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8132 Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8133 end_of_last_line (struct window *w, Charbpos startp)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8134 {
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8135 return start_end_of_last_line (w, startp, 1, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8136 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8137
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8138 static Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8139 end_of_last_line_may_error (struct window *w, Charbpos startp)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8140 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8141 return start_end_of_last_line (w, startp, 1, 1);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8142 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8143
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8144
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8145 /* For window W, what does the starting position have to be so that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8146 the line containing POINT will cover pixel position PIXPOS. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8147
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8148 Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8149 start_with_line_at_pixpos (struct window *w, Charbpos point, int pixpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8150 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8151 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8152 int cur_elt;
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8153 Charbpos cur_pos, prev_pos = point;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8154 int point_line_height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8155 int pixheight = pixpos - WINDOW_TEXT_TOP (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8156
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8157 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8158 w->line_cache_validation_override++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8159
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8160 cur_elt = point_in_line_start_cache (w, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8161 /* #### See comment in update_line_start_cache about big minibuffers. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8162 if (cur_elt < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8163 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8164 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8165 return point;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8166 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8167
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8168 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8169
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8170 while (1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8171 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8172 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8173
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8174 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8175
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8176 /* Do not take into account the value of vertical_clip here.
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8177 That is the responsibility of the calling functions. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8178 if (pixheight < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8179 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8180 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8181 if (-pixheight > point_line_height)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8182 /* We can't make the target line cover pixpos, so put it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8183 above pixpos. That way it will at least be visible. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8184 return prev_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8185 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8186 return cur_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8187 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8188
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8189 cur_elt--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8190 while (cur_elt < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8191 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8192 Charbpos from, to;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8193 int win_char_height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8194
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8195 if (cur_pos <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8196 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8197 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8198 return BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8199 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8200
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8201 win_char_height = window_char_height (w, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8202 if (!win_char_height)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8203 win_char_height = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8204
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8205 from = find_next_newline_no_quit (b, cur_pos, -win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8206 to = line_start_cache_end (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8207 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8208
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8209 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8210 assert (cur_elt >= -1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8211 /* This used to be cur_elt>=0 under the assumption that if
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8212 point is in the top line and not at BUF_BEGV, then
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
8213 setting the window_start to a newline before the start of
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8214 the first line will always cause scrolling.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8215
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8216 However in my (jv) opinion this is wrong. That new line
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8217 can be hidden in various ways: invisible extents, an
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8218 explicit window-start not at a newline character etc.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8219 The existence of those are indeed known to create crashes
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8220 on that assert. So we have no option but to continue the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8221 search if we found point at the top of the line_start_cache
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8222 again. */
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
8223 cur_pos = Dynarr_atp (w->line_start_cache,0)->start;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8224 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8225 prev_pos = cur_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8226 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8227 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8228
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8229 /* For window W, what does the starting position have to be so that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8230 the line containing point is on display line LINE. If LINE is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8231 positive it is considered to be the number of lines from the top of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8232 the window (0 is the top line). If it is negative the number is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8233 considered to be the number of lines from the bottom (-1 is the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8234 bottom line). */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8235
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8236 Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8237 start_with_point_on_display_line (struct window *w, Charbpos point, int line)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8238 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8239 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8240 w->line_cache_validation_override++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8241
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8242 if (line >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8243 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8244 int cur_elt = point_in_line_start_cache (w, point, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8245
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8246 if (cur_elt - line < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8247 cur_elt = 0; /* Hit the top */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8248 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8249 cur_elt -= line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8250
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8251 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8252 return Dynarr_atp (w->line_start_cache, cur_elt)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8253 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8254 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8255 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8256 /* The calculated value of pixpos is correct for the bottom line
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8257 or what we want when line is -1. Therefore we subtract one
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8258 because we have already handled one line. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8259 int new_line = -line - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8260 int cur_elt = point_in_line_start_cache (w, point, new_line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8261 int pixpos = WINDOW_TEXT_BOTTOM (w);
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8262 Charbpos retval, search_point;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8263
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8264 /* If scroll_on_clipped_lines is false, the last "visible" line of
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8265 the window covers the pixel at WINDOW_TEXT_BOTTOM (w) - 1.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8266 If s_o_c_l is true, then we don't want to count a clipped
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8267 line, so back up from the bottom by the height of the line
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8268 containing point. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8269 if (scroll_on_clipped_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8270 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8271 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8272 pixpos -= 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8273
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8274 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8275 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8276 /* Hit the bottom of the buffer. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8277 int adjustment =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8278 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8279 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8280 int defheight;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8281
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
8282 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8283 default_face_height_and_width (window, &defheight, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8284
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8285 cur_elt = Dynarr_length (w->line_start_cache) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8286
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8287 pixpos -= (adjustment * defheight);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8288 if (pixpos < WINDOW_TEXT_TOP (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8289 pixpos = WINDOW_TEXT_TOP (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8290 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8291 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8292 cur_elt = cur_elt + new_line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8293
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8294 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8295
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8296 retval = start_with_line_at_pixpos (w, search_point, pixpos);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8297 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8298 return retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8299 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8300 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8301
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8302 /* This is used to speed up vertical scrolling by caching the known
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8303 buffer starting positions for display lines. This allows the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8304 scrolling routines to avoid costly calls to regenerate_window. If
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8305 NO_REGEN is true then it will only add the values in the DESIRED
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8306 display structs which are in the given range.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8307
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8308 Note also that the FROM/TO values are minimums. It is possible
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8309 that this function will actually add information outside of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8310 lines containing those positions. This can't hurt but it could
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8311 possibly help.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8312
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8313 #### We currently force the cache to have only 1 contiguous region.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8314 It might help to make the cache a dynarr of caches so that we can
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8315 cover more areas. This might, however, turn out to be a lot of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8316 overhead for too little gain. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8317
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8318 static void
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8319 update_line_start_cache (struct window *w, Charbpos from, Charbpos to,
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8320 Charbpos point, int no_regen)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8321 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8322 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8323 line_start_cache_dynarr *cache = w->line_start_cache;
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8324 Charbpos low_bound, high_bound;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8325
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8326 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8327 w->line_cache_validation_override++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8328
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8329 if (from < BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8330 from = BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8331 if (to > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8332 to = BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8333
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8334 if (from > to)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8335 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8336 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8337 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8338 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8339
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8340 if (Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8341 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8342 low_bound = line_start_cache_start (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8343 high_bound = line_start_cache_end (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8344
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8345 /* Check to see if the desired range is already in the cache. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8346 if (from >= low_bound && to <= high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8347 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8348 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8349 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8350 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8351
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8352 /* Check to make sure that the desired range is adjacent to the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8353 current cache. If not, invalidate the cache. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8354 if (to < low_bound || from > high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8355 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8356 Dynarr_reset (cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8357 low_bound = high_bound = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8358 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8359 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8360 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8361 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8362 low_bound = high_bound = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8363 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8364
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8365 w->line_cache_last_updated = make_int (BUF_MODIFF (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8366
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8367 /* This could be integrated into the next two sections, but it is easier
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8368 to follow what's going on by having it separate. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8369 if (no_regen)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8370 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8371 Charbpos start, end;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8372
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8373 update_internal_cache_list (w, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8374 if (!Dynarr_length (internal_cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8375 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8376 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8377 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8378 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8379
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8380 start = Dynarr_atp (internal_cache, 0)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8381 end =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8382 Dynarr_atp (internal_cache, Dynarr_length (internal_cache) - 1)->end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8383
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8384 /* We aren't allowed to generate additional information to fill in
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8385 gaps, so if the DESIRED structs don't overlap the cache, reset the
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8386 cache. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8387 if (Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8388 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8389 if (end < low_bound || start > high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8390 Dynarr_reset (cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8391
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8392 /* #### What should really happen if what we are doing is
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8393 extending a line (the last line)? */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8394 if (Dynarr_length (cache) == 1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8395 && Dynarr_length (internal_cache) == 1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8396 Dynarr_reset (cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8397 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8398
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8399 if (!Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8400 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8401 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8402 Dynarr_length (internal_cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8403 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8404 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8405 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8406
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8407 /* An extra check just in case the calling function didn't pass in
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8408 the bounds of the DESIRED structs in the first place. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8409 if (start >= low_bound && end <= high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8410 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8411 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8412 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8413 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8414
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8415 /* At this point we know that the internal cache partially overlaps
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8416 the main cache. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8417 if (start < low_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8418 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8419 int ic_elt = Dynarr_length (internal_cache) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8420 while (ic_elt >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8421 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8422 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8423 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8424 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8425 ic_elt--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8426 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8427
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8428 if (!(ic_elt >= 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8429 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8430 Dynarr_reset (cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8431 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8432 Dynarr_length (internal_cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8433 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8434 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8435 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8436
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8437 Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8438 ic_elt + 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8439 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8440
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8441 if (end > high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8442 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8443 int ic_elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8444
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8445 while (ic_elt < Dynarr_length (internal_cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8446 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8447 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8448 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8449 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8450 ic_elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8451 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8452
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8453 if (!(ic_elt < Dynarr_length (internal_cache)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8454 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8455 Dynarr_reset (cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8456 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8457 Dynarr_length (internal_cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8458 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8459 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8460 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8461
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8462 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8463 Dynarr_length (internal_cache) - ic_elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8464 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8465
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8466 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8467 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8468 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8469
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8470 if (!Dynarr_length (cache) || from < low_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8471 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8472 Charbpos startp = find_next_newline_no_quit (b, from, -1);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8473 int marker = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8474 int old_lb = low_bound;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8475
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8476 while (startp < old_lb || low_bound == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8477 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8478 int ic_elt;
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8479 Charbpos new_startp;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8480
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8481 regenerate_window (w, startp, point, CMOTION_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8482 update_internal_cache_list (w, CMOTION_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8483
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8484 /* If this assert is triggered then regenerate_window failed
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8485 to layout a single line. This is not possible since we
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8486 force at least a single line to be layout for CMOTION_DISP */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8487 assert (Dynarr_length (internal_cache));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8488 assert (startp == Dynarr_atp (internal_cache, 0)->start);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8489
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8490 ic_elt = Dynarr_length (internal_cache) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8491 if (low_bound != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8492 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8493 while (ic_elt >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8494 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8495 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8496 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8497 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8498 ic_elt--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8499 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8500 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8501 assert (ic_elt >= 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8502
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8503 new_startp = Dynarr_atp (internal_cache, ic_elt)->end + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8504
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8505 /*
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8506 * Handle invisible text properly:
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8507 * If the last line we're inserting has the same end as the
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8508 * line before which it will be added, merge the two lines.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8509 */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8510 if (Dynarr_length (cache) &&
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8511 Dynarr_atp (internal_cache, ic_elt)->end ==
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8512 Dynarr_atp (cache, marker)->end)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8513 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8514 Dynarr_atp (cache, marker)->start
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8515 = Dynarr_atp (internal_cache, ic_elt)->start;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8516 Dynarr_atp (cache, marker)->height
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8517 = Dynarr_atp (internal_cache, ic_elt)->height;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8518 ic_elt--;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8519 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8520
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8521 if (ic_elt >= 0) /* we still have lines to add.. */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8522 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8523 Dynarr_insert_many (cache, Dynarr_atp (internal_cache, 0),
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8524 ic_elt + 1, marker);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8525 marker += (ic_elt + 1);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8526 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8527
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8528 if (startp < low_bound || low_bound == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8529 low_bound = startp;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8530 startp = new_startp;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8531 if (startp > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8532 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8533 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8534 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8535 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8536 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8537 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8538
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8539 assert (Dynarr_length (cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8540 assert (from >= low_bound);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8541
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8542 /* Readjust the high_bound to account for any changes made while
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8543 correcting the low_bound. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8544 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8545
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8546 if (to > high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8547 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8548 Charbpos startp = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end + 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8549
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8550 do
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8551 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8552 regenerate_window (w, startp, point, CMOTION_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8553 update_internal_cache_list (w, CMOTION_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8554
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8555 /* See comment above about regenerate_window failing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8556 assert (Dynarr_length (internal_cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8557
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8558 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8559 Dynarr_length (internal_cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8560 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8561 startp = high_bound + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8562 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8563 while (to > high_bound);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8564 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8565
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8566 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8567 assert (to <= high_bound);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8568 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8569
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8570
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8571 /* Given x and y coordinates in characters, relative to a window,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8572 return the pixel location corresponding to those coordinates. The
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8573 pixel location returned is the center of the given character
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8574 position. The pixel values are generated relative to the window,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8575 not the frame.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8576
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8577 The modeline is considered to be part of the window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8578
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8579 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8580 glyph_to_pixel_translation (struct window *w, int char_x, int char_y,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8581 int *pix_x, int *pix_y)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8582 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8583 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8584 int num_disp_lines, modeline;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8585 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8586 int defheight, defwidth;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8587
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
8588 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8589 default_face_height_and_width (window, &defheight, &defwidth);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8590
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8591 /* If we get a bogus value indicating somewhere above or to the left of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8592 the window, use the first window line or character position
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8593 instead. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8594 if (char_y < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8595 char_y = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8596 if (char_x < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8597 char_x = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8598
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8599 num_disp_lines = Dynarr_length (dla);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8600 modeline = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8601 if (num_disp_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8602 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8603 if (Dynarr_atp (dla, 0)->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8604 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8605 num_disp_lines--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8606 modeline = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8607 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8608 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8609
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8610 /* First check if the y position intersects the display lines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8611 if (char_y < num_disp_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8612 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8613 struct display_line *dl = Dynarr_atp (dla, char_y + modeline);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8614 struct display_block *db = get_display_block_from_line (dl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8615
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8616 *pix_y = (dl->ypos - dl->ascent +
647
b39c14581166 [xemacs-hg @ 2001-08-13 04:45:47 by ben]
ben
parents: 638
diff changeset
8617 ((dl->ascent + dl->descent - dl->clip) >> 1));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8618
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8619 if (char_x < Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8620 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8621 struct rune *rb = Dynarr_atp (db->runes, char_x);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8622
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8623 *pix_x = rb->xpos + (rb->width >> 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8624 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8625 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8626 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8627 int last_rune = Dynarr_length (db->runes) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8628 struct rune *rb = Dynarr_atp (db->runes, last_rune);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8629
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8630 char_x -= last_rune;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8631
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8632 *pix_x = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8633 *pix_x += ((char_x - 1) * defwidth);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8634 *pix_x += (defwidth >> 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8635 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8636 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8637 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8638 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8639 /* It didn't intersect, so extrapolate. #### For now, we include the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8640 modeline in this since we don't have true character positions in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8641 it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8642
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8643 if (!Dynarr_length (w->face_cachels))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8644 reset_face_cachels (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8645
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8646 char_y -= num_disp_lines;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8647
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8648 if (Dynarr_length (dla))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8649 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8650 struct display_line *dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8651 *pix_y = dl->ypos + dl->descent - dl->clip;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8652 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8653 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8654 *pix_y = WINDOW_TEXT_TOP (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8655
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8656 *pix_y += (char_y * defheight);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8657 *pix_y += (defheight >> 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8658
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8659 *pix_x = WINDOW_TEXT_LEFT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8660 /* Don't adjust by one because this is still the unadjusted value. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8661 *pix_x += (char_x * defwidth);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8662 *pix_x += (defwidth >> 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8663 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8664
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8665 if (*pix_x > w->pixel_left + w->pixel_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8666 *pix_x = w->pixel_left + w->pixel_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8667 if (*pix_y > w->pixel_top + w->pixel_height)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8668 *pix_y = w->pixel_top + w->pixel_height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8669
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8670 *pix_x -= w->pixel_left;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8671 *pix_y -= w->pixel_top;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8672 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8673
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8674 /* Given a display line and a position, determine if there is a glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8675 there and return information about it if there is. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8676
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8677 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8678 get_position_object (struct display_line *dl, Lisp_Object *obj1,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8679 Lisp_Object *obj2, int x_coord, int *low_x_coord,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8680 int *high_x_coord)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8681 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8682 struct display_block *db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8683 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8684 int block =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8685 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8686
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8687 /* We use get_next_display_block to get the actual display block
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8688 that would be displayed at x_coord. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8689
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8690 if (block == NO_BLOCK)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8691 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8692 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8693 db = Dynarr_atp (dl->display_blocks, block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8694
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8695 for (elt = 0; elt < Dynarr_length (db->runes); elt++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8696 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8697 struct rune *rb = Dynarr_atp (db->runes, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8698
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8699 if (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8700 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8701 if (rb->type == RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8702 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8703 *obj1 = rb->object.dglyph.glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8704 *obj2 = rb->object.dglyph.extent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8705 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8706 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8707 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8708 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8709 *obj2 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8710 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8711
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8712 if (low_x_coord)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8713 *low_x_coord = rb->xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8714 if (high_x_coord)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8715 *high_x_coord = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8716
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8717 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8718 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8719 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8720 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8721
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8722 #define UPDATE_CACHE_RETURN \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8723 do { \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8724 d->pixel_to_glyph_cache.valid = 1; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8725 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8726 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8727 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8728 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8729 d->pixel_to_glyph_cache.frame = f; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8730 d->pixel_to_glyph_cache.col = *col; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8731 d->pixel_to_glyph_cache.row = *row; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8732 d->pixel_to_glyph_cache.obj_x = *obj_x; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8733 d->pixel_to_glyph_cache.obj_y = *obj_y; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8734 d->pixel_to_glyph_cache.w = *w; \
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8735 d->pixel_to_glyph_cache.charpos = *charpos; \
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8736 d->pixel_to_glyph_cache.closest = *closest; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8737 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8738 d->pixel_to_glyph_cache.obj1 = *obj1; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8739 d->pixel_to_glyph_cache.obj2 = *obj2; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8740 d->pixel_to_glyph_cache.retval = position; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8741 RETURN_SANS_WARNINGS position; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8742 } while (0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8743
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8744 /* Given x and y coordinates in pixels relative to a frame, return
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8745 information about what is located under those coordinates.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8746
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8747 The return value will be one of:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8748
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8749 OVER_TOOLBAR: over one of the 4 frame toolbars
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8750 OVER_MODELINE: over a modeline
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8751 OVER_BORDER: over an internal border
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8752 OVER_NOTHING: over the text area, but not over text
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8753 OVER_OUTSIDE: outside of the frame border
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8754 OVER_TEXT: over text in the text area
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8755
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8756 OBJ1 is one of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8757
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8758 -- a toolbar button
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8759 -- a glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8760 -- nil if the coordinates are not over a glyph or a toolbar button.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8761
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8762 OBJ2 is one of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8763
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8764 -- an extent, if the coordinates are over a glyph in the text area
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8765 -- nil otherwise.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8766
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8767 If the coordinates are over a glyph, OBJ_X and OBJ_Y give the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8768 equivalent coordinates relative to the upper-left corner of the glyph.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8769
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8770 If the coordinates are over a character, OBJ_X and OBJ_Y give the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8771 equivalent coordinates relative to the upper-left corner of the character.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8772
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8773 Otherwise, OBJ_X and OBJ_Y are undefined.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8774 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8775
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8776 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8777 pixel_to_glyph_translation (struct frame *f, int x_coord, int y_coord,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8778 int *col, int *row, int *obj_x, int *obj_y,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8779 struct window **w, Charbpos *charpos,
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8780 Charbpos *closest, Charcount *modeline_closest,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8781 Lisp_Object *obj1, Lisp_Object *obj2)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8782 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8783 struct device *d;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8784 struct pixel_to_glyph_translation_cache *cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8785 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8786 int frm_left, frm_right, frm_top, frm_bottom;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8787 int low_x_coord, high_x_coord, low_y_coord, high_y_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8788 int position = OVER_NOTHING;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8789 int device_check_failed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8790 display_line_dynarr *dla;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8791
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8792 /* This is a safety valve in case this got called with a frame in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8793 the middle of being deleted. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8794 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8795 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8796 device_check_failed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8797 d = NULL, cache = NULL; /* Warning suppression */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8798 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8799 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8800 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8801 d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8802 cache = &d->pixel_to_glyph_cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8803 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8804
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8805 if (!device_check_failed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8806 && cache->valid
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8807 && cache->frame == f
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8808 && cache->low_x_coord <= x_coord
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8809 && cache->high_x_coord > x_coord
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8810 && cache->low_y_coord <= y_coord
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8811 && cache->high_y_coord > y_coord)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8812 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8813 *col = cache->col;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8814 *row = cache->row;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8815 *obj_x = cache->obj_x;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8816 *obj_y = cache->obj_y;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8817 *w = cache->w;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8818 *charpos = cache->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8819 *closest = cache->closest;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8820 *modeline_closest = cache->modeline_closest;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8821 *obj1 = cache->obj1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8822 *obj2 = cache->obj2;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8823
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8824 return cache->retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8825 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8826 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8827 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8828 *col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8829 *row = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8830 *obj_x = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8831 *obj_y = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8832 *w = 0;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8833 *charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8834 *closest = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8835 *modeline_closest = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8836 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8837 *obj2 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8838
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8839 low_x_coord = x_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8840 high_x_coord = x_coord + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8841 low_y_coord = y_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8842 high_y_coord = y_coord + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8843 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8844
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8845 if (device_check_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8846 return OVER_NOTHING;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8847
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8848 frm_left = FRAME_LEFT_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8849 frm_right = FRAME_RIGHT_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8850 frm_top = FRAME_TOP_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8851 frm_bottom = FRAME_BOTTOM_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8852
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8853 /* Check if the mouse is outside of the text area actually used by
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8854 redisplay. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8855 if (y_coord < frm_top)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8856 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8857 if (y_coord >= FRAME_TOP_BORDER_START (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8858 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8859 low_y_coord = FRAME_TOP_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8860 high_y_coord = frm_top;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8861 position = OVER_BORDER;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8862 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8863 else if (y_coord >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8864 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8865 low_y_coord = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8866 high_y_coord = FRAME_TOP_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8867 position = OVER_TOOLBAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8868 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8869 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8870 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8871 low_y_coord = y_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8872 high_y_coord = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8873 position = OVER_OUTSIDE;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8874 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8875 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8876 else if (y_coord >= frm_bottom)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8877 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8878 if (y_coord < FRAME_BOTTOM_BORDER_END (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8879 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8880 low_y_coord = frm_bottom;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8881 high_y_coord = FRAME_BOTTOM_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8882 position = OVER_BORDER;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8883 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8884 else if (y_coord < FRAME_PIXHEIGHT (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8885 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8886 low_y_coord = FRAME_BOTTOM_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8887 high_y_coord = FRAME_PIXHEIGHT (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8888 position = OVER_TOOLBAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8889 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8890 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8891 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8892 low_y_coord = FRAME_PIXHEIGHT (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8893 high_y_coord = y_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8894 position = OVER_OUTSIDE;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8895 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8896 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8897
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8898 if (position != OVER_TOOLBAR && position != OVER_BORDER)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8899 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8900 if (x_coord < frm_left)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8901 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8902 if (x_coord >= FRAME_LEFT_BORDER_START (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8903 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8904 low_x_coord = FRAME_LEFT_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8905 high_x_coord = frm_left;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8906 position = OVER_BORDER;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8907 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8908 else if (x_coord >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8909 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8910 low_x_coord = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8911 high_x_coord = FRAME_LEFT_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8912 position = OVER_TOOLBAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8913 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8914 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8915 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8916 low_x_coord = x_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8917 high_x_coord = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8918 position = OVER_OUTSIDE;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8919 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8920 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8921 else if (x_coord >= frm_right)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8922 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8923 if (x_coord < FRAME_RIGHT_BORDER_END (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8924 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8925 low_x_coord = frm_right;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8926 high_x_coord = FRAME_RIGHT_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8927 position = OVER_BORDER;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8928 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8929 else if (x_coord < FRAME_PIXWIDTH (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8930 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8931 low_x_coord = FRAME_RIGHT_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8932 high_x_coord = FRAME_PIXWIDTH (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8933 position = OVER_TOOLBAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8934 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8935 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8936 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8937 low_x_coord = FRAME_PIXWIDTH (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8938 high_x_coord = x_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8939 position = OVER_OUTSIDE;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8940 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8941 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8942 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8943
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8944 #ifdef HAVE_TOOLBARS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8945 if (position == OVER_TOOLBAR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8946 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8947 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8948 *obj2 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8949 *w = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8950 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8951 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8952 #endif /* HAVE_TOOLBARS */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8953
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8954 /* We still have to return the window the pointer is next to and its
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8955 relative y position even if it is outside the x boundary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8956 if (x_coord < frm_left)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8957 x_coord = frm_left;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8958 else if (x_coord > frm_right)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8959 x_coord = frm_right;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8960
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8961 /* Same in reverse. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8962 if (y_coord < frm_top)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8963 y_coord = frm_top;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8964 else if (y_coord > frm_bottom)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8965 y_coord = frm_bottom;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8966
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8967 /* Find what window the given coordinates are actually in. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8968 window = f->root_window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8969 *w = find_window_by_pixel_pos (x_coord, y_coord, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8970
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8971 /* If we didn't find a window, we're done. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8972 if (!*w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8973 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8974 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8975 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8976 else if (position != OVER_NOTHING)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8977 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8978 *closest = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8979 *modeline_closest = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8980
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8981 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8982 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8983 *w = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8984 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8985 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8986 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8987
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8988 /* Check if the window is a minibuffer but isn't active. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8989 if (MINI_WINDOW_P (*w) && !minibuf_level)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8990 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8991 /* Must reset the window value since some callers will ignore
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8992 the return value if it is set. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8993 *w = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8994 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8995 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8996
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8997 /* See if the point is over window vertical divider */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8998 if (window_needs_vertical_divider (*w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8999 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9000 int div_x_high = WINDOW_RIGHT (*w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9001 int div_x_low = div_x_high - window_divider_width (*w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9002 int div_y_high = WINDOW_BOTTOM (*w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9003 int div_y_low = WINDOW_TOP (*w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9004
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9005 if (div_x_low < x_coord && x_coord <= div_x_high &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9006 div_y_low < y_coord && y_coord <= div_y_high)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9007 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9008 low_x_coord = div_x_low;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9009 high_x_coord = div_x_high;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9010 low_y_coord = div_y_low;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9011 high_y_coord = div_y_high;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9012 position = OVER_V_DIVIDER;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9013 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9014 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9015 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9016
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9017 dla = window_display_lines (*w, CURRENT_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9018
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9019 for (*row = 0; *row < Dynarr_length (dla); (*row)++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9020 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9021 int really_over_nothing = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9022 struct display_line *dl = Dynarr_atp (dla, *row);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9023
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9024 if ((int) (dl->ypos - dl->ascent) <= y_coord
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9025 && y_coord <= (int) (dl->ypos + dl->descent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9026 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9027 int check_margin_glyphs = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9028 struct display_block *db = get_display_block_from_line (dl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9029 struct rune *rb = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9030
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9031 if (x_coord < dl->bounds.left_white
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9032 || x_coord >= dl->bounds.right_white)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9033 check_margin_glyphs = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9034
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9035 low_y_coord = dl->ypos - dl->ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9036 high_y_coord = dl->ypos + dl->descent + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9037
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9038 if (position == OVER_BORDER
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9039 || position == OVER_OUTSIDE
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9040 || check_margin_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9041 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9042 int x_check, left_bound;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9043
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9044 if (check_margin_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9045 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9046 x_check = x_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9047 left_bound = dl->bounds.left_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9048 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9049 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9050 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9051 x_check = high_x_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9052 left_bound = frm_left;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9053 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9054
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9055 if (Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9056 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9057 if (x_check <= left_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9058 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9059 if (dl->modeline)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9060 *modeline_closest = Dynarr_atp (db->runes, 0)->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9061 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9062 *closest = Dynarr_atp (db->runes, 0)->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9063 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9064 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9065 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9066 if (dl->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9067 *modeline_closest =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9068 Dynarr_atp (db->runes,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9069 Dynarr_length (db->runes) - 1)->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9070 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9071 *closest =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9072 Dynarr_atp (db->runes,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9073 Dynarr_length (db->runes) - 1)->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9074 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9075
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9076 if (dl->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9077 *modeline_closest += dl->offset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9078 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9079 *closest += dl->offset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9080 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9081 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9082 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9083 /* #### What should be here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9084 if (dl->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9085 *modeline_closest = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9086 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9087 *closest = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9088 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9089
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9090 if (check_margin_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9091 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9092 if (x_coord < dl->bounds.left_in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9093 || x_coord >= dl->bounds.right_in)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9094 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9095 /* If we are over the outside margins then we
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
9096 know the loop over the text block isn't going
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
9097 to accomplish anything. So we go ahead and
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
9098 set what information we can right here and
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
9099 return. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9100 (*row)--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9101 *obj_y = y_coord - (dl->ypos - dl->ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9102 get_position_object (dl, obj1, obj2, x_coord,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9103 &low_x_coord, &high_x_coord);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9104
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9105 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9106 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9107 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9108 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9109 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9110 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9111
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9112 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9113 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9114 int past_end = (*col == Dynarr_length (db->runes));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9115
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9116 if (!past_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9117 rb = Dynarr_atp (db->runes, *col);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9118
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9119 if (past_end ||
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9120 (rb->xpos <= x_coord && x_coord < rb->xpos + rb->width))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9121 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9122 if (past_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9123 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9124 (*col)--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9125 rb = Dynarr_atp (db->runes, *col);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9126 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9127
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9128 *charpos = rb->charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9129 low_x_coord = rb->xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9130 high_x_coord = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9131
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9132 if (rb->type == RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9133 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9134 int elt = *col + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9135
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9136 /* Find the first character after the glyph. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9137 while (elt < Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9138 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9139 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9140 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9141 if (dl->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9142 *modeline_closest =
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9143 (Dynarr_atp (db->runes, elt)->charpos +
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9144 dl->offset);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9145 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9146 *closest =
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9147 (Dynarr_atp (db->runes, elt)->charpos +
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9148 dl->offset);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9149 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9150 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9151
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9152 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9153 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9154
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9155 /* In this case we failed to find a non-glyph
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
9156 character so we return the last position
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
9157 displayed on the line. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9158 if (elt == Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9159 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9160 if (dl->modeline)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9161 *modeline_closest = dl->end_charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9162 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9163 *closest = dl->end_charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9164 really_over_nothing = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9165 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9166 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9167 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9168 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9169 if (dl->modeline)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9170 *modeline_closest = rb->charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9171 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9172 *closest = rb->charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9173 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9174
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9175 if (dl->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9176 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9177 *row = window_displayed_height (*w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9178
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9179 if (position == OVER_NOTHING)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9180 position = OVER_MODELINE;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9181
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9182 if (rb->type == RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9183 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9184 *obj1 = rb->object.dglyph.glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9185 *obj2 = rb->object.dglyph.extent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9186 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9187 else if (rb->type == RUNE_CHAR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9188 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9189 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9190 *obj2 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9191 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9192 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9193 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9194 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9195 *obj2 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9196 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9197
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9198 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9199 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9200 else if (past_end
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9201 || (rb->type == RUNE_CHAR
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9202 && rb->object.chr.ch == '\n'))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9203 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9204 (*row)--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9205 /* At this point we may have glyphs in the right
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
9206 inside margin. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9207 if (check_margin_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9208 get_position_object (dl, obj1, obj2, x_coord,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9209 &low_x_coord, &high_x_coord);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9210 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9211 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9212 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9213 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9214 (*row)--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9215 if (rb->type == RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9216 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9217 *obj1 = rb->object.dglyph.glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9218 *obj2 = rb->object.dglyph.extent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9219 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9220 else if (rb->type == RUNE_CHAR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9221 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9222 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9223 *obj2 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9224 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9225 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9226 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9227 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9228 *obj2 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9229 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9230
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9231 *obj_x = x_coord - rb->xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9232 *obj_y = y_coord - (dl->ypos - dl->ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9233
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9234 /* At this point we may have glyphs in the left
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
9235 inside margin. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9236 if (check_margin_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9237 get_position_object (dl, obj1, obj2, x_coord, 0, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9238
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9239 if (position == OVER_NOTHING && !really_over_nothing)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9240 position = OVER_TEXT;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9241
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9242 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9243 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9244 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9245 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9246 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9247 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9248
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9249 *row = Dynarr_length (dla) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9250 if (FRAME_WIN_P (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9251 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9252 int bot_elt = Dynarr_length (dla) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9253
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9254 if (bot_elt >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9255 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9256 struct display_line *dl = Dynarr_atp (dla, bot_elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9257 int adj_area = y_coord - (dl->ypos + dl->descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9258 Lisp_Object lwin;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9259 int defheight;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9260
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
9261 lwin = wrap_window (*w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9262 default_face_height_and_width (lwin, 0, &defheight);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9263
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9264 *row += (adj_area / defheight);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9265 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9266 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9267
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9268 /* #### This should be checked out some more to determine what
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9269 should really be going on. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9270 if (!MARKERP ((*w)->start[CURRENT_DISP]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9271 *closest = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9272 else
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9273 *closest = end_of_last_line_may_error (*w,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9274 marker_position ((*w)->start[CURRENT_DISP]));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9275 *col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9276 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9277 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9278 #undef UPDATE_CACHE_RETURN
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9279
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9280
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9281 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9282 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9283 /* Lisp functions */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9284 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9285 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9286
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9287 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9288 Ensure that all minibuffers are correctly showing the echo area.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9289 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9290 ())
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9291 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9292 Lisp_Object devcons, concons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9293
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
9294 if (in_display)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
9295 return Qnil;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
9296
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9297 DEVICE_LOOP_NO_BREAK (devcons, concons)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9298 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9299 struct device *d = XDEVICE (XCAR (devcons));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9300 Lisp_Object frmcons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9301
1279
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9302 if (DEVICE_STREAM_P (d))
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9303 continue;
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9304
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9305 DEVICE_FRAME_LOOP (frmcons, d)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9306 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9307 struct frame *f = XFRAME (XCAR (frmcons));
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9308 int depth;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9309
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9310 if (FRAME_REPAINT_P (f) && FRAME_HAS_MINIBUF_P (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9311 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9312 Lisp_Object window = FRAME_MINIBUF_WINDOW (f);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9313
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9314 MAYBE_DEVMETH (d, frame_output_begin, (f));
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9315
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9316 /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9317 * If the frame size has changed, there may be random
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9318 * chud on the screen left from previous messages
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9319 * because redisplay_frame hasn't been called yet.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9320 * Clear the screen to get rid of the potential mess.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9321 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9322 if (f->echo_area_garbaged)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9323 {
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9324 MAYBE_DEVMETH (d, clear_frame, (f));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9325 f->echo_area_garbaged = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9326 }
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9327 depth = enter_redisplay_critical_section ();
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9328 redisplay_window (window, 0);
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9329 exit_redisplay_critical_section (depth);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9330 MAYBE_DEVMETH (d, frame_output_end, (f));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9331 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9332 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9333 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9334
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9335 return Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9336 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9337
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9338 DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9339 Clear frame FRAME and output again what is supposed to appear on it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9340 FRAME defaults to the selected frame if omitted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9341 Normally, redisplay is preempted as normal if input arrives. However,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9342 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9343 input and is guaranteed to proceed to completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9344 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9345 (frame, no_preempt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9346 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9347 struct frame *f = decode_frame (frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9348 int count = specpdl_depth ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9349
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9350 if (!NILP (no_preempt))
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9351 internal_bind_int (&disable_preemption, 1 + disable_preemption);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9352
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9353 f->clear = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9354 redisplay_frame (f, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9355
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9356 /* See the comment in Fredisplay_frame. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9357 RESET_CHANGED_SET_FLAGS;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9358
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
9359 return unbind_to (count);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9360 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9361
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9362 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9363 Ensure that FRAME's contents are correctly displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9364 This differs from `redraw-frame' in that it only redraws what needs to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9365 be updated, as opposed to unconditionally clearing and redrawing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9366 the frame.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9367 FRAME defaults to the selected frame if omitted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9368 Normally, redisplay is preempted as normal if input arrives. However,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9369 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9370 input and is guaranteed to proceed to completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9371 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9372 (frame, no_preempt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9373 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9374 struct frame *f = decode_frame (frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9375 int count = specpdl_depth ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9376
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9377 if (!NILP (no_preempt))
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9378 internal_bind_int (&disable_preemption, 1 + disable_preemption);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9379
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9380 redisplay_frame (f, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9381
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9382 /* If we don't reset the global redisplay flags here, subsequent
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9383 changes to the display will not get registered by redisplay
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9384 because it thinks it already has registered changes. If you
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9385 really knew what you were doing you could confuse redisplay by
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9386 calling Fredisplay_frame while updating another frame. We assume
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9387 that if you know what you are doing you will not be that
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9388 stupid. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9389 RESET_CHANGED_SET_FLAGS;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9390
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
9391 return unbind_to (count);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9392 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9393
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9394 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9395 Clear device DEVICE and output again what is supposed to appear on it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9396 DEVICE defaults to the selected device if omitted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9397 Normally, redisplay is preempted as normal if input arrives. However,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9398 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9399 input and is guaranteed to proceed to completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9400 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9401 (device, no_preempt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9402 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9403 struct device *d = decode_device (device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9404 Lisp_Object frmcons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9405 int count = specpdl_depth ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9406
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9407 if (!NILP (no_preempt))
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9408 internal_bind_int (&disable_preemption, 1 + disable_preemption);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9409
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9410 DEVICE_FRAME_LOOP (frmcons, d)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9411 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9412 XFRAME (XCAR (frmcons))->clear = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9413 }
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9414 redisplay_device (d, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9415
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9416 /* See the comment in Fredisplay_frame. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9417 RESET_CHANGED_SET_FLAGS;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9418
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
9419 return unbind_to (count);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9420 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9421
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9422 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9423 Ensure that DEVICE's contents are correctly displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9424 This differs from `redraw-device' in that it only redraws what needs to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9425 be updated, as opposed to unconditionally clearing and redrawing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9426 the device.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9427 DEVICE defaults to the selected device if omitted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9428 Normally, redisplay is preempted as normal if input arrives. However,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9429 if optional second arg NO-PREEMPT is non-nil, redisplay will not stop for
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9430 input and is guaranteed to proceed to completion.
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9431
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9432 Note: If you simply want everything redisplayed, the current idiom is
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9433 `(sit-for 0)'.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9434 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9435 (device, no_preempt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9436 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9437 struct device *d = decode_device (device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9438 int count = specpdl_depth ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9439
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9440 if (!NILP (no_preempt))
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9441 internal_bind_int (&disable_preemption, 1 + disable_preemption);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9442
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9443 redisplay_device (d, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9444
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9445 /* See the comment in Fredisplay_frame. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9446 RESET_CHANGED_SET_FLAGS;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9447
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
9448 return unbind_to (count);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9449 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9450
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9451 /* Big lie. Big lie. This will force all modelines to be updated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9452 regardless if the all flag is set or not. It remains in existence
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9453 solely for backwards compatibility. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9454 DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9455 Force the modeline of the current buffer to be redisplayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9456 With optional non-nil ALL, force redisplay of all modelines.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9457 */
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9458 (UNUSED (all)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9459 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9460 MARK_MODELINE_CHANGED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9461 return Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9462 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9463
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9464 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9465 Force an immediate update of the cursor on FRAME.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9466 FRAME defaults to the selected frame if omitted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9467 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9468 (frame))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9469 {
1279
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9470 struct frame *f = decode_frame (frame);
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9471
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9472 if (!FRAME_STREAM_P (f))
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9473 redisplay_redraw_cursor (f, 1);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9474 return Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9475 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9476
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9477
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9478 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9479 /* */
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9480 /* Change flags */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9481 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9482 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9483
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9484 static void
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9485 margin_width_changed_in_frame (Lisp_Object UNUSED (specifier),
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9486 struct frame *UNUSED (f),
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9487 Lisp_Object UNUSED (oldval))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9488 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9489 /* Nothing to be done? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9490 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9491
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9492 int
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9493 redisplay_variable_changed (Lisp_Object UNUSED (sym),
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9494 Lisp_Object *UNUSED (val),
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9495 Lisp_Object UNUSED (in_object),
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9496 int UNUSED (flags))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9497 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9498 /* #### clip_changed should really be renamed something like
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9499 global_redisplay_change. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9500 MARK_CLIP_CHANGED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9501 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9502 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9503
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9504 /* This is called if the built-in glyphs have their properties
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9505 changed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9506 void
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9507 redisplay_glyph_changed (Lisp_Object UNUSED (glyph),
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9508 Lisp_Object UNUSED (property), Lisp_Object locale)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9509 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9510 if (WINDOWP (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9511 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9512 MARK_FRAME_GLYPHS_CHANGED (XFRAME (WINDOW_FRAME (XWINDOW (locale))));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9513 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9514 else if (FRAMEP (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9515 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9516 MARK_FRAME_GLYPHS_CHANGED (XFRAME (locale));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9517 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9518 else if (DEVICEP (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9519 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9520 Lisp_Object frmcons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9521 DEVICE_FRAME_LOOP (frmcons, XDEVICE (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9522 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9523 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9524 else if (CONSOLEP (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9525 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9526 Lisp_Object frmcons, devcons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9527 CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, XCONSOLE (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9528 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9529 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9530 else /* global or buffer */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9531 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9532 Lisp_Object frmcons, devcons, concons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9533 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9534 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9535 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9536 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9537
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9538 static void
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9539 text_cursor_visible_p_changed (Lisp_Object UNUSED (specifier),
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9540 struct window *w, Lisp_Object UNUSED (oldval))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9541 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9542 if (XFRAME (w->frame)->init_finished)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9543 Fforce_cursor_redisplay (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9544 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9545
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9546 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9547 mark_buffers_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9548 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9549 MARK_TYPE_CHANGED (buffers);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9550 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9551
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9552 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9553 mark_clip_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9554 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9555 MARK_TYPE_CHANGED (clip);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9556 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9557
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9558 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9559 mark_extents_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9560 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9561 MARK_TYPE_CHANGED (extents);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9562 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9563
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9564 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9565 mark_icon_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9566 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9567 MARK_TYPE_CHANGED (icon);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9568 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9569
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9570 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9571 mark_menubar_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9572 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9573 MARK_TYPE_CHANGED (menubar);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9574 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9575
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9576 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9577 mark_modeline_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9578 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9579 MARK_TYPE_CHANGED (modeline);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9580 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9581
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9582 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9583 mark_point_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9584 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9585 MARK_TYPE_CHANGED (point);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9586 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9587
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9588 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9589 mark_toolbar_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9590 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9591 MARK_TYPE_CHANGED (toolbar);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9592 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9593
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9594 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9595 mark_gutter_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9596 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9597 MARK_TYPE_CHANGED (gutter);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9598 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9599
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9600 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9601 mark_glyphs_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9602 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9603 MARK_TYPE_CHANGED (glyphs);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9604 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9605
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9606 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9607 mark_subwindows_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9608 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9609 MARK_TYPE_CHANGED (subwindows);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9610 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9611
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9612 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9613 mark_subwindows_state_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9614 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9615 MARK_TYPE_CHANGED (subwindows_state);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9616 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9617
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9618 #ifdef MEMORY_USAGE_STATS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9619
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9620
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9621 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9622 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9623 /* memory usage computation */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9624 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9625 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9626
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9627 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9628 compute_rune_dynarr_usage (rune_dynarr *dyn, struct overhead_stats *ovstats)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9629 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9630 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9631 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9632
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9633 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9634 compute_display_block_dynarr_usage (display_block_dynarr *dyn,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9635 struct overhead_stats *ovstats)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9636 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9637 int total, i;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9638
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9639 if (!dyn)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9640 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9641
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9642 total = Dynarr_memory_usage (dyn, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9643 for (i = 0; i < Dynarr_largest (dyn); i++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9644 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9645
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9646 return total;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9647 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9648
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9649 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9650 compute_glyph_block_dynarr_usage (glyph_block_dynarr *dyn,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9651 struct overhead_stats *ovstats)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9652 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9653 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9654 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9655
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9656 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9657 compute_display_line_dynarr_usage (display_line_dynarr *dyn,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9658 struct overhead_stats *ovstats)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9659 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9660 int total, i;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9661
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9662 if (!dyn)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9663 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9664
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9665 total = Dynarr_memory_usage (dyn, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9666 for (i = 0; i < Dynarr_largest (dyn); i++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9667 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9668 struct display_line *dl = &Dynarr_at (dyn, i);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9669 total += compute_display_block_dynarr_usage(dl->display_blocks, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9670 total += compute_glyph_block_dynarr_usage (dl->left_glyphs, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9671 total += compute_glyph_block_dynarr_usage (dl->right_glyphs, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9672 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9673
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9674 return total;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9675 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9676
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9677 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9678 compute_line_start_cache_dynarr_usage (line_start_cache_dynarr *dyn,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9679 struct overhead_stats *ovstats)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9680 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9681 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9682 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9683
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9684 #endif /* MEMORY_USAGE_STATS */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9685
1204
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
9686 #ifdef ERROR_CHECK_DISPLAY
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
9687
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9688 static int
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9689 sledgehammer_check_redisplay_structs_1 (struct window *w,
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9690 void *UNUSED (closure))
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9691 {
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9692 int i, j;
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9693 display_line_dynarr *dl;
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9694
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9695 dl = window_display_lines (w, CURRENT_DISP);
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
9696
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9697 for (i = 0; i < Dynarr_largest (dl); i++)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9698 for (j = i + 1; j < Dynarr_largest (dl); j++)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9699 assert (Dynarr_atp (dl, i)->display_blocks !=
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9700 Dynarr_atp (dl, j)->display_blocks);
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9701
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9702 dl = window_display_lines (w, DESIRED_DISP);
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9703
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9704 for (i = 0; i < Dynarr_largest (dl); i++)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9705 for (j = i + 1; j < Dynarr_largest (dl); j++)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9706 assert (Dynarr_atp (dl, i)->display_blocks !=
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9707 Dynarr_atp (dl, j)->display_blocks);
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9708
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9709 return 0;
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9710 }
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9711
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9712 static void
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9713 sledgehammer_check_redisplay_structs (void)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9714 {
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9715 map_windows (0, sledgehammer_check_redisplay_structs_1, NULL);
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9716 }
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9717
1204
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
9718 #endif /* ERROR_CHECK_DISPLAY */
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
9719
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9720
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9721 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9722 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9723 /* initialization */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9724 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9725 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9726
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9727 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9728 init_redisplay (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9729 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9730 disable_preemption = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9731 preemption_count = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9732
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9733 #ifndef PDUMP
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9734 if (!initialized)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9735 #endif
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9736 {
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9737 if (!cmotion_display_lines)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9738 cmotion_display_lines = Dynarr_new (display_line);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
9739 if (!mode_spec_ibyte_string)
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
9740 mode_spec_ibyte_string = Dynarr_new (Ibyte);
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9741 if (!formatted_string_extent_dynarr)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9742 formatted_string_extent_dynarr = Dynarr_new (EXTENT);
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9743 if (!formatted_string_extent_start_dynarr)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9744 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9745 if (!formatted_string_extent_end_dynarr)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9746 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9747 if (!internal_cache)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9748 internal_cache = Dynarr_new (line_start_cache);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9749 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9750
4477
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9751 if (!initialized)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9752 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9753
4477
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9754 if (noninteractive)
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9755 {
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9756 Vinitial_device_type = Qstream;
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9757 return;
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9758 }
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9759
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9760 /* If the user wants to use a window system, we shouldn't bother
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9761 initializing the terminal. This is especially important when the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9762 terminal is so dumb that emacs gives up before and doesn't bother
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9763 using the window system.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9764
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9765 If the DISPLAY environment variable is set, try to use X, and die
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9766 with an error message if that doesn't work. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9767
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9768 #ifdef HAVE_X_WINDOWS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9769 if (!strcmp (display_use, "x"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9770 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9771 /* Some stuff checks this way early. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9772 Vwindow_system = Qx;
4477
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9773 Vinitial_device_type = Qx;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9774 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9775 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9776 #endif /* HAVE_X_WINDOWS */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9777
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9778 #ifdef HAVE_GTK
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9779 if (!strcmp (display_use, "gtk"))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9780 {
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9781 Vwindow_system = Qgtk;
4477
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9782 Vinitial_device_type = Qgtk;
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9783 return;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9784 }
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9785 #endif
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9786
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9787 #ifdef HAVE_MS_WINDOWS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9788 if (!strcmp (display_use, "mswindows"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9789 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9790 /* Some stuff checks this way early. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9791 Vwindow_system = Qmswindows;
4477
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9792 Vinitial_device_type = Qmswindows;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9793 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9794 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9795 #endif /* HAVE_MS_WINDOWS */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9796
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9797 #ifdef HAVE_TTY
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9798 /* If no window system has been specified, try to use the terminal. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9799 if (!isatty (0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9800 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9801 stderr_out ("XEmacs: standard input is not a tty\n");
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9802 exit (1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9803 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9804
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9805 /* Look at the TERM variable */
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
9806 if (!egetenv ("TERM"))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9807 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9808 stderr_out ("Please set the environment variable TERM; see tset(1).\n");
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9809 exit (1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9810 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9811
4477
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9812 Vinitial_device_type = Qtty;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9813 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9814 #else /* not HAVE_TTY */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9815 /* No DISPLAY specified, and no TTY support. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9816 stderr_out ("XEmacs: Cannot open display.\n\
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9817 Please set the environmental variable DISPLAY to an appropriate value.\n");
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9818 exit (1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9819 #endif
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9820 /* Unreached. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9821 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9822
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9823 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9824 syms_of_redisplay (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9825 {
563
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 545
diff changeset
9826 DEFSYMBOL (Qcursor_in_echo_area);
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 545
diff changeset
9827 DEFSYMBOL (Qdisplay_warning_buffer);
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 545
diff changeset
9828 DEFSYMBOL (Qbar_cursor);
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 545
diff changeset
9829 DEFSYMBOL (Qtop_bottom);
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 545
diff changeset
9830 DEFSYMBOL (Qbuffer_list_changed_hook);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9831
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9832 DEFSUBR (Fredisplay_echo_area);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9833 DEFSUBR (Fredraw_frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9834 DEFSUBR (Fredisplay_frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9835 DEFSUBR (Fredraw_device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9836 DEFSUBR (Fredisplay_device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9837 DEFSUBR (Fredraw_modeline);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9838 DEFSUBR (Fforce_cursor_redisplay);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9839 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9840
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9841 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9842 vars_of_redisplay (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9843 {
1292
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
9844 QSin_redisplay = build_msg_string ("(in redisplay)");
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
9845 staticpro (&QSin_redisplay);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9846
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
9847 Vpost_redisplay_actions = Qnil;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
9848 staticpro (&Vpost_redisplay_actions);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
9849
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9850 #if 0
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9851 staticpro (&last_arrow_position);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9852 staticpro (&last_arrow_string);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9853 last_arrow_position = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9854 last_arrow_string = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9855 #endif /* 0 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9856
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9857 /* #### Probably temporary */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9858 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9859 \(Temporary) Setting this will impact the performance of the internal
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9860 line start cache.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9861 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9862 cache_adjustment = 2;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9863
1268
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
9864 DEFVAR_INT ("maximum-preempts", &max_preempts /*
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
9865 Maximum number of times redisplay can be preempted by user input.
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
9866 */ );
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
9867 max_preempts = INIT_MAX_PREEMPTS;
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
9868
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9869 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9870 Minimum pixel height for clipped bottom display line.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9871 A clipped line shorter than this won't be displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9872 */ ,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9873 redisplay_variable_changed);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9874 vertical_clip = 5;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9875
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9876 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9877 Minimum visible area for clipped glyphs at right boundary.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9878 Clipped glyphs shorter than this won't be displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9879 Only pixmap glyph instances are currently allowed to be clipped.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9880 */ ,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9881 redisplay_variable_changed);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9882 horizontal_clip = 5;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9883
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9884 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9885 String displayed by modeline-format's "%m" specification.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9886 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9887 Vglobal_mode_string = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9888
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9889 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9890 Marker for where to display an arrow on top of the buffer text.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9891 This must be the beginning of a line in order to work.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9892 See also `overlay-arrow-string'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9893 */ ,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9894 redisplay_variable_changed);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9895 Voverlay_arrow_position = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9896
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9897 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9898 String or glyph to display as an arrow. See also `overlay-arrow-position'.
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
9899 \(Note that despite the name of this variable, it can be set to a glyph as
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9900 well as a string.)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9901 */ ,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9902 redisplay_variable_changed);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9903 Voverlay_arrow_string = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9904
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9905 DEFVAR_INT ("scroll-step", &scroll_step /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9906 *The number of lines to try scrolling a window by when point moves out.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9907 If that fails to bring point back on frame, point is centered instead.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9908 If this is zero, point is always centered after it moves off screen.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9909 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9910 scroll_step = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9911
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9912 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9913 *Scroll up to this many lines, to bring point back on screen.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9914 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9915 scroll_conservatively = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9916
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9917 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9918 &truncate_partial_width_windows /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9919 *Non-nil means truncate lines in all windows less than full frame wide.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9920 */ ,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9921 redisplay_variable_changed);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9922 truncate_partial_width_windows = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9923
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9924 DEFVAR_LISP ("visible-bell", &Vvisible_bell /*
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9925 *Non-nil substitutes a visual signal for the audible bell.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9926
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9927 Default behavior is to flash the whole screen. On some platforms,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9928 special effects are available using the following values:
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9929
3025
facf3239ba30 [xemacs-hg @ 2005-10-25 11:16:19 by ben]
ben
parents: 2552
diff changeset
9930 `display' Flash the whole screen (ie, the default behavior).
facf3239ba30 [xemacs-hg @ 2005-10-25 11:16:19 by ben]
ben
parents: 2552
diff changeset
9931 `top-bottom' Flash only the top and bottom lines of the selected frame.
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9932
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9933 When effects are unavailable on a platform, the visual bell is the
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9934 default, whole screen. (Currently only X supports any special effects.)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9935 */ );
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9936 Vvisible_bell = Qnil;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9937
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9938 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9939 *Non-nil means no need to redraw entire frame after suspending.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9940 A non-nil value is useful if the terminal can automatically preserve
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9941 Emacs's frame display when you reenter Emacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9942 It is up to you to set this variable if your terminal can do that.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9943 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9944 no_redraw_on_reenter = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9945
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9946 DEFVAR_LISP ("window-system", &Vwindow_system /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9947 A symbol naming the window-system under which Emacs is running,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9948 such as `x', or nil if emacs is running on an ordinary terminal.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9949
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9950 Do not use this variable, except for GNU Emacs compatibility, as it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9951 gives wrong values in a multi-device environment. Use `console-type'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9952 instead.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9953 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9954 Vwindow_system = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9955
4477
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9956 DEFVAR_CONST_LISP ("initial-device-type", &Vinitial_device_type /*
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9957 The type of the first XEmacs device to be created.
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9958
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9959 This is constant; it's used by the command line handling code to communicate
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9960 to Lisp what type the initial device to be created should be.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9961 */ );
4477
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9962 Vinitial_device_type = Qnil;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9963
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9964 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9965 Non-nil means put cursor in minibuffer, at end of any message there.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9966 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9967 cursor_in_echo_area = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9968
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9969 /* #### Shouldn't this be generalized as follows:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9970
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9971 if nil, use block cursor.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9972 if a number, use a bar cursor of that width.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9973 Otherwise, use a 1-pixel bar cursor.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9974
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9975 #### Or better yet, this variable should be trashed entirely
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9976 (use a Lisp-magic variable to maintain compatibility)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9977 and a specifier `cursor-shape' added, which allows a block
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9978 cursor, a bar cursor, a flashing block or bar cursor,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9979 maybe a caret cursor, etc. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9980
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9981 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /*
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents: 444
diff changeset
9982 *Use vertical bar cursor if non-nil. If t width is 1 pixel, otherwise 2.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9983 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9984 Vbar_cursor = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9985
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9986 DEFVAR_LISP ("buffer-list-changed-hook", &Vbuffer_list_changed_hook /*
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9987 Function or functions to call when a frame's buffer list has changed.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9988 This is called during redisplay, before redisplaying each frame.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9989 Functions on this hook are called with one argument, the frame.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9990 */ );
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9991 Vbuffer_list_changed_hook = Qnil;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9992
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9993 DEFVAR_INT ("display-warning-tick", &display_warning_tick /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9994 Bump this to tell the C code to call `display-warning-buffer'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9995 at next redisplay. You should not normally change this; the function
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9996 `display-warning' automatically does this at appropriate times.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9997 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9998 display_warning_tick = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9999
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10000 DEFVAR_BOOL ("inhibit-warning-display", &inhibit_warning_display /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10001 Non-nil means inhibit display of warning messages.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10002 You should *bind* this, not set it. Any pending warning messages
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10003 will be displayed when the binding no longer applies.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10004 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10005 /* reset to 0 by startup.el after the splash screen has displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10006 This way, the warnings don't obliterate the splash screen. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10007 inhibit_warning_display = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10008
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10009 DEFVAR_BOOL ("column-number-start-at-one", &column_number_start_at_one /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10010 *Non-nil means column display number starts at 1.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10011 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10012 column_number_start_at_one = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10013 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10014
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10015 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10016 specifier_vars_of_redisplay (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10017 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10018 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10019 *Width of left margin.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10020 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10021 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10022 Vleft_margin_width = Fmake_specifier (Qnatnum);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10023 set_specifier_fallback (Vleft_margin_width, list1 (Fcons (Qnil, Qzero)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10024 set_specifier_caching (Vleft_margin_width,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10025 offsetof (struct window, left_margin_width),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10026 some_window_value_changed,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10027 offsetof (struct frame, left_margin_width),
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
10028 margin_width_changed_in_frame, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10029
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10030 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10031 *Width of right margin.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10032 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10033 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10034 Vright_margin_width = Fmake_specifier (Qnatnum);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10035 set_specifier_fallback (Vright_margin_width, list1 (Fcons (Qnil, Qzero)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10036 set_specifier_caching (Vright_margin_width,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10037 offsetof (struct window, right_margin_width),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10038 some_window_value_changed,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10039 offsetof (struct frame, right_margin_width),
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
10040 margin_width_changed_in_frame, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10041
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10042 DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10043 *Minimum ascent height of lines.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10044 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10045 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10046 Vminimum_line_ascent = Fmake_specifier (Qnatnum);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10047 set_specifier_fallback (Vminimum_line_ascent, list1 (Fcons (Qnil, Qzero)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10048 set_specifier_caching (Vminimum_line_ascent,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10049 offsetof (struct window, minimum_line_ascent),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10050 some_window_value_changed,
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
10051 0, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10052
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10053 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10054 *Minimum descent height of lines.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10055 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10056 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10057 Vminimum_line_descent = Fmake_specifier (Qnatnum);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10058 set_specifier_fallback (Vminimum_line_descent, list1 (Fcons (Qnil, Qzero)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10059 set_specifier_caching (Vminimum_line_descent,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10060 offsetof (struct window, minimum_line_descent),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10061 some_window_value_changed,
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
10062 0, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10063
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10064 DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10065 *Non-nil means use the left outside margin as extra whitespace when
3025
facf3239ba30 [xemacs-hg @ 2005-10-25 11:16:19 by ben]
ben
parents: 2552
diff changeset
10066 displaying `whitespace' or `inside-margin' glyphs.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10067 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10068 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10069 Vuse_left_overflow = Fmake_specifier (Qboolean);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10070 set_specifier_fallback (Vuse_left_overflow, list1 (Fcons (Qnil, Qnil)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10071 set_specifier_caching (Vuse_left_overflow,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10072 offsetof (struct window, use_left_overflow),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10073 some_window_value_changed,
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
10074 0, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10075
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10076 DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10077 *Non-nil means use the right outside margin as extra whitespace when
3025
facf3239ba30 [xemacs-hg @ 2005-10-25 11:16:19 by ben]
ben
parents: 2552
diff changeset
10078 displaying `whitespace' or `inside-margin' glyphs.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10079 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10080 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10081 Vuse_right_overflow = Fmake_specifier (Qboolean);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10082 set_specifier_fallback (Vuse_right_overflow, list1 (Fcons (Qnil, Qnil)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10083 set_specifier_caching (Vuse_right_overflow,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10084 offsetof (struct window, use_right_overflow),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10085 some_window_value_changed,
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
10086 0, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10087
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10088 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10089 *Non-nil means the text cursor is visible (this is usually the case).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10090 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10091 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10092 Vtext_cursor_visible_p = Fmake_specifier (Qboolean);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10093 set_specifier_fallback (Vtext_cursor_visible_p, list1 (Fcons (Qnil, Qt)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10094 set_specifier_caching (Vtext_cursor_visible_p,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10095 offsetof (struct window, text_cursor_visible_p),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10096 text_cursor_visible_p_changed,
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
10097 0, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10098
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10099 }