annotate src/redisplay.c @ 4868:0dd76c7b7846

Merge.
author Mike Sperber <sperber@deinprogramm.de>
date Mon, 18 Jan 2010 08:48:09 +0100
parents 91b3d00e717f
children ea701c23ed84
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
4815
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
633 redisplay_window_text_width_ichar_string (struct window *w, int findex,
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
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
4815
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
650 static int
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
651 redisplay_window_text_width_string (struct window *w, int findex,
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
652 Ibyte *nonreloc, Lisp_Object reloc,
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
653 Bytecount offset, Bytecount len)
428
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);
4815
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
663 return redisplay_window_text_width_ichar_string
867
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
4815
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
669 redisplay_text_width_string (Lisp_Object domain, Lisp_Object face,
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
670 Ibyte *nonreloc, Lisp_Object reloc,
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
671 Bytecount offset, Bytecount len)
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
672 {
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
673 Lisp_Object window = DOMAIN_WINDOW (domain);
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
674 Lisp_Object frame = DOMAIN_FRAME (domain);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
675 unsigned char charsets[NUM_LEADING_BYTES];
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
676 struct face_cachel cachel;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
677
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
678 if (!rtw_ichar_dynarr)
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
679 rtw_ichar_dynarr = Dynarr_new (Ichar);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
680 Dynarr_reset (rtw_ichar_dynarr);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
681
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
682 fixup_internal_substring (nonreloc, reloc, offset, &len);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
683 if (STRINGP (reloc))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
684 nonreloc = XSTRING_DATA (reloc);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
685 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
686 find_charsets_in_ibyte_string (charsets, nonreloc, len);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
687 reset_face_cachel (&cachel);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
688 cachel.face = face;
4815
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
689 ensure_face_cachel_complete (&cachel,
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
690 NILP (window) ? frame : window,
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
691 charsets);
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
692 return DEVMETH (XDEVICE (FRAME_DEVICE (XFRAME (frame))),
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
693 text_width, (XFRAME (frame),
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
694 &cachel,
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
695 Dynarr_atp (rtw_ichar_dynarr, 0),
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
696 Dynarr_length (rtw_ichar_dynarr)));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
697 }
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 /* 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
700 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
701 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
702
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
703 struct display_block *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
704 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
705 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
706 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
707 struct display_block db;
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 /* 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
710 if so, return it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
711 if (dl->display_blocks)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
712 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
713 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++)
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 if (Dynarr_at (dl->display_blocks, elt).type == type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
716 return Dynarr_atp (dl->display_blocks, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
717 }
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 /* 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
720 might still be allocated blocks we need to reuse. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
721 if (elt < Dynarr_largest (dl->display_blocks))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
722 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
723 struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
724
3025
facf3239ba30 [xemacs-hg @ 2005-10-25 11:16:19 by ben]
ben
parents: 2552
diff changeset
725 /* "add" the block to the list */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
726 Dynarr_increment (dl->display_blocks);
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 /* initialize and return */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
729 dbp->type = type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
730 return dbp;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
731 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
732 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
733 else
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 /* 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
736 bock array. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
737 dl->display_blocks = Dynarr_new (display_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
738 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
739
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
740 /* 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
741 one and add it to the line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
742 xzero (db);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
743 db.type = type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
744 db.runes = Dynarr_new (rune);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
745 Dynarr_add (dl->display_blocks, db);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
746
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
747 /* Return the newly added display block. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
748 elt = Dynarr_length (dl->display_blocks) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
749
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
750 return Dynarr_atp (dl->display_blocks, elt);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
753 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
754 tab_char_width (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
755 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
756 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
757 int char_tab_width = XINT (b->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 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
760
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
761 return char_tab_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
762 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
763
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
764 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
765 space_width (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
766 {
3659
98af8a976fc3 [xemacs-hg @ 2006-11-05 22:31:31 by aidan]
aidan
parents: 3498
diff changeset
767 /* While tabs are traditionally composed of spaces, for variable-width
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
768 fonts the space character tends to give too narrow a value. So
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
769 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
770 character width for the default face. If this is actually
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
771 defined by the font then it is probably the best thing to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
772 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
773 already calculated its width. Thus we can avoid a call to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
774 XTextWidth on X frames by just querying the default width. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
775 return XFONT_INSTANCE
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
776 (WINDOW_FACE_CACHEL_FONT (w, DEFAULT_INDEX, Vcharset_ascii))->width;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
779 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
780 tab_pix_width (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
781 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
782 return space_width (w) * tab_char_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
783 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
784
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
785 /* Given a pixel position in a window, return the pixel location of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
786 the next tabstop. Tabs are calculated from the left window edge in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
787 terms of spaces displayed in the default face. Formerly the space
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
788 width was determined using the currently active face. That method
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
789 leads to tabstops which do not line up. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
790
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
791 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
792 next_tab_position (struct window *w, int start_pixpos, int left_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
793 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
794 int n_pos = left_pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
795 int pix_tab_width = tab_pix_width (w);
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 /* Adjust n_pos for any hscrolling which has happened. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
798 if (WINDOW_SCROLLED (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
799 n_pos -= space_width (w) * (w->hscroll - 1) + w->left_xoffset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
800
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
801 while (n_pos <= start_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
802 n_pos += pix_tab_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
803
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
804 return n_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
805 }
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 /* For the given window, calculate the outside and margin boundaries for a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
808 display line. The whitespace boundaries must be calculated by the text
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
809 layout routines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
810
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
811 layout_bounds
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
812 calculate_display_line_boundaries (struct window *w, int modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
813 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
814 layout_bounds bounds;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
815
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
816 /* Set the outermost boundaries which are the boundaries of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
817 window itself minus the gutters (and minus the scrollbars if this
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
818 is for the modeline). */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
819 if (!modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
820 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
821 bounds.left_out = WINDOW_TEXT_LEFT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
822 bounds.right_out = WINDOW_TEXT_RIGHT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
823 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
824 else
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 bounds.left_out = WINDOW_MODELINE_LEFT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
827 bounds.right_out = WINDOW_MODELINE_RIGHT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
828 }
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 /* The inner boundaries mark where the glyph margins are located. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
831 bounds.left_in = bounds.left_out + window_left_margin_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
832 bounds.right_in = bounds.right_out - window_right_margin_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
833
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
834 /* We cannot fully calculate the whitespace boundaries as they
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
835 depend on the contents of the line being displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
836 bounds.left_white = bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
837 bounds.right_white = bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
838
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
839 return bounds;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
840 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
841
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
842 /* 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
843 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
844 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
845
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
846 static void
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
847 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
848 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
849 int i;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
850 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
851 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
852 struct rune *r = Dynarr_atp (fixup->runes,i);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
853 if (r->type == RUNE_DGLYPH)
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
854 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
855 if (r->object.dglyph.ascent < dl->ascent)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
856 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
857 r->object.dglyph.descent;
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
858 }
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
859 }
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
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
862 /* 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
863 display_line as a whole).
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
864
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
865 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
866 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
867 (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
868 us by `add_ichar_rune'.)
819
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 they're all manually positioned, then
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
871 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
872 work.
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
873
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
874 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
875 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
876 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
877 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
878 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
879 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
880 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
881 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
882 such that the largest glyph will fit.
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
883
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
884 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
885 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
886 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
887 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
888 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
889 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
890
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
891 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
892 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
893 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
894 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
895
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
896 static void
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
897 calculate_baseline (pos_data *data)
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 /* Blank line: baseline is default font's baseline. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
900
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
901 if (!data->new_ascent && !data->new_descent)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
902 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
903 /* 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
904 face. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
905 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
906 &data->new_descent, 0, 0, 0);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
907 }
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
908
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
909 /* No automatically positioned glyphs? Return at once. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
910 if (!data->need_baseline_computation)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
911 return;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
912
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
913 /* 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
914 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
915 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
916 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
917 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
918 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
919 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
920
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
921 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
922 &default_font_descent, &default_font_height,
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
923 0, 0);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
924
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
925 scaled_default_font_ascent = data->max_pixmap_height *
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
926 default_font_ascent / default_font_height;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
927
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
928 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
929
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
930 /* 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
931 or are things big enough?
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
932
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
933 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
934 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
935 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
936 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
937 default_font_descent / default_font_height) + 1;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
938
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
939 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
940 }
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
941 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
942 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
943
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
944 /* Given a display line and a starting position, ensure that the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
945 contents of the display line accurately represent the visual
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
946 representation of the buffer contents starting from the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
947 position when displayed in the given window. The display line ends
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
948 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
949 window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
950
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
951 static Charbpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
952 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
953 Charbpos start_pos, prop_block_dynarr **prop,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
954 int type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
955 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
956 Charbpos ret_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
957 int overlay_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
958 struct buffer *b = XBUFFER (WINDOW_BUFFER (w));
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 /* 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
961 if (!bounds)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
962 dl->bounds = calculate_display_line_boundaries (w, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
963
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
964 /* Reset what this line is using. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
965 if (dl->display_blocks)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
966 Dynarr_reset (dl->display_blocks);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
967 if (dl->left_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
968 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
969 Dynarr_free (dl->left_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
970 dl->left_glyphs = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
971 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
972 if (dl->right_glyphs)
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 Dynarr_free (dl->right_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
975 dl->right_glyphs = 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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
978 /* We aren't generating a modeline at the moment. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
979 dl->modeline = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
980
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
981 /* Create a display block for the text region of the line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
982 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
983 /* #### urk urk urk!!! Chuck fix this shit! */
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
984 Bytebpos hacked_up_bytebpos =
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
985 create_text_block (w, dl, charbpos_to_bytebpos (b, start_pos),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
986 prop, type);
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
987 if (hacked_up_bytebpos > BYTE_BUF_ZV (b))
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
988 ret_charpos = BUF_ZV (b) + 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
989 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
990 ret_charpos = bytebpos_to_charbpos (b, hacked_up_bytebpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
991 }
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
992 dl->charpos = start_pos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
993 if (dl->end_charpos < dl->charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
994 dl->end_charpos = dl->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
995
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
996 if (MARKERP (Voverlay_arrow_position)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
997 && EQ (w->buffer, Fmarker_buffer (Voverlay_arrow_position))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
998 && start_pos == marker_position (Voverlay_arrow_position)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
999 && (STRINGP (Voverlay_arrow_string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1000 || GLYPHP (Voverlay_arrow_string)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1001 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1002 overlay_width = create_overlay_glyph_block (w, dl);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1003 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1004 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1005 overlay_width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1006
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1007 /* If there are left glyphs associated with any character in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1008 text block, then create a display block to handle them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1009 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1010 create_left_glyph_block (w, dl, overlay_width);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1011
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1012 /* If there are right glyphs associated with any character in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1013 text block, then create a display block to handle them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1014 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1015 create_right_glyph_block (w, dl);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1016
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1017 /* In the future additional types of display blocks may be generated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1018 here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1019
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1020 w->last_redisplay_pos = ret_charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1021
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1022 return ret_charpos;
428
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1025 /* 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
1026 the block had better be empty.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1027
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1028 Yes, there are multiple places where this function is called but
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1029 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
1030 with byte_start_col_enabled a little differently depending on the
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1031 object being worked with. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1032
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1033 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1034 add_hscroll_rune (pos_data *data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1035 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1036 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1037 prop_block_dynarr *retval;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1038 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
1039 int old_cursor_type = data->cursor_type;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1040 Bytebpos byte_old_charpos = data->byte_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1041
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1042 if (data->cursor_type == CURSOR_ON
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1043 && 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
1044 && data->byte_cursor_charpos <= data->byte_charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1045 {
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1046 data->byte_cursor_charpos = data->byte_start_col_enabled;
428
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1049 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1050 data->cursor_type = NO_CURSOR;
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
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1053 data->byte_endpos = data->byte_charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1054 data->byte_charpos = data->byte_start_col_enabled;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1055
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1056 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1057 gb.glyph = Vhscroll_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1058 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1059 int oldpixpos = data->pixpos;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1060 retval = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1061 GLYPH_CACHEL (XWINDOW (data->window),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1062 HSCROLL_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1063 data->hscroll_glyph_width_adjust =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1064 data->pixpos - oldpixpos - space_width (XWINDOW (data->window));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1065 }
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1066 data->byte_endpos = 0;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1067 data->byte_cursor_charpos = byte_old_cursor_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1068 data->cursor_type = old_cursor_type;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1069 data->byte_charpos = byte_old_charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1070
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1071 data->byte_start_col_enabled = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1072 return retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1073 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1074
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1075 /* 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
1076 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
1077 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
1078 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
1079 to affect the total line height. (See add_ibyte_string_runes()). */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1080
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1081 static prop_block_dynarr *
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1082 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
1083 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1084 struct rune rb, *crb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1085 int width, local;
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 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1089 data->start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1090
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1091 if (data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1092 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1093 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1094
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1095 if (data->byte_start_col_enabled)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1096 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1097 return add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1098 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1099
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1100 if (data->ch == '\n')
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 data->font_is_bogus = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1103 /* Cheesy end-of-line pseudo-character. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1104 width = data->blank_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1105 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1106 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1107 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1108 Lisp_Object charset = ichar_charset (data->ch);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1109 if (!EQ (charset, data->last_charset) ||
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1110 data->findex != data->last_findex)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1111 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1112 /* OK, we need to do things the hard way. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1113 struct window *w = XWINDOW (data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1114 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1115 Lisp_Object font_instance =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1116 ensure_face_cachel_contains_charset (cachel, data->window,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1117 charset);
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1118 Lisp_Font_Instance *fi;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1119
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1120 if (EQ (font_instance, Vthe_null_font_instance))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1121 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1122 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1123 data->font_is_bogus = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1124 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1125 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1126 data->font_is_bogus = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1127
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1128 fi = XFONT_INSTANCE (font_instance);
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1129 if (!fi->proportional_p || data->font_is_bogus)
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1130 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1131 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
1132
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1133 data->last_char_width =
4815
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
1134 redisplay_window_text_width_ichar_string
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
1135 (XWINDOW (data->window), data->findex, &ch, 1);
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1136 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1137 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1138 data->last_char_width = -1;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1139
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1140 if (!no_contribute_to_line_height)
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1141 {
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1142 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
1143 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
1144 }
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1145
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1146 data->last_charset = charset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1147 data->last_findex = data->findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1148 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1149
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1150 width = data->last_char_width;
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1151 if (width < 0) /* proportional fonts */
4815
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
1152 width = redisplay_window_text_width_ichar_string
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
1153 (XWINDOW (data->window), data->findex, &data->ch, 1);
428
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1156 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos))
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 return ADD_FAILED;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1161 if (Dynarr_length (data->db->runes) < Dynarr_largest (data->db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1162 {
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
1163 crb = Dynarr_past_lastp (data->db->runes);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1164 local = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1165 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1166 else
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 crb = &rb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1169 local = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1170 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1171
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1172 crb->findex = data->findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1173 crb->xpos = data->pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1174 crb->width = width;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1175 if (data->byte_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1176 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1177 if (NILP (data->string))
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1178 crb->charpos =
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1179 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1180 (XWINDOW (data->window))),
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1181 data->byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1182 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1183 crb->charpos =
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1184 string_index_byte_to_char (data->string, data->byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1185 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1186 else if (data->is_modeline)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1187 crb->charpos = data->modeline_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1188 else
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1189 /* Text but not in buffer */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1190 crb->charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1191 crb->type = RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1192 crb->object.chr.ch = data->font_is_bogus ? '~' : data->ch;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1193 crb->endpos = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1194
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1195 if (data->cursor_type == CURSOR_ON)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1196 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1197 if (data->byte_charpos == data->byte_cursor_charpos)
428
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 crb->cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1200 data->cursor_x = Dynarr_length (data->db->runes);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1203 crb->cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1204 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1205 else if (data->cursor_type == NEXT_CURSOR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1206 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1207 crb->cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1208 data->cursor_x = Dynarr_length (data->db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1209 data->cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1210 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1211 else if (data->cursor_type == IGNORE_CURSOR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1212 crb->cursor_type = IGNORE_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1213 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1214 crb->cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1215
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1216 if (local)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1217 Dynarr_add (data->db->runes, *crb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1218 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1219 Dynarr_increment (data->db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1220
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1221 data->pixpos += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1222
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1223 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1224 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1225
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1226 static prop_block_dynarr *
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1227 add_ichar_rune (pos_data *data)
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 return add_ichar_rune_1 (data, 0);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1230 }
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1231
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1232 /* 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
1233 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
1234 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
1235 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
1236 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
1237 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
1238 whether glyph-contrib-p is true.) */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1239
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1240 static prop_block_dynarr *
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1241 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
1242 Bytecount c_length, int no_prop,
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1243 int no_contribute_to_line_height)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1244 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1245 Ibyte *pos, *end = c_string + c_length;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1246 prop_block_dynarr *prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1247
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1248 /* #### This function is too simplistic. It needs to do the same
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1249 sort of character interpretation (display-table lookup,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1250 ctl-arrow checking), etc. that create_text_block() does.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1251 The functionality to do this in that routine needs to be
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1252 modularized. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1253
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1254 for (pos = c_string; pos < end;)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1255 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1256 Ibyte *old_pos = pos;
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1257
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1258 data->ch = itext_ichar (pos);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1259
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1260 prop = add_ichar_rune_1 (data, no_contribute_to_line_height);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1261
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1262 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1263 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1264 if (no_prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1265 return ADD_FAILED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1266 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1267 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1268 struct prop_block pb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1269 Bytecount len = end - pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1270 prop = Dynarr_new (prop_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1271
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1272 pb.type = PROP_STRING;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1273 pb.data.p_string.str = xnew_array (Ibyte, len);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1274 strncpy ((char *) pb.data.p_string.str, (char *) pos, len);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1275 pb.data.p_string.len = len;
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 Dynarr_add (prop, pb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1278 return prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1279 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1280 }
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1281 INC_IBYTEPTR (pos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1282 assert (pos <= end);
464
5aa1854ad537 Import from CVS: tag r21-2-47
cvs
parents: 462
diff changeset
1283 /* #### Duplicate code from add_string_to_fstring_db_runes
5aa1854ad537 Import from CVS: tag r21-2-47
cvs
parents: 462
diff changeset
1284 should we do more?*/
5aa1854ad537 Import from CVS: tag r21-2-47
cvs
parents: 462
diff changeset
1285 data->bytepos += pos - old_pos;
428
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 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1289 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1290
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1291 /* 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
1292 rune will be displayed in the foreground color of the associated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1293 face. */
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 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1296 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
1297 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1298 struct rune rb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1299
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1300 /* 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
1301 been to add it as a tab. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1302 if (data->start_col)
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 /* assert (w != NULL) */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1305 prop_block_dynarr *retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1306
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1307 /* 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
1308 the width of this tab and return. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1309 if (char_tab_width < data->start_col)
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 data->start_col -= char_tab_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1312 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1313 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1314 else if (char_tab_width == data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1315 data->blank_width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1316 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1317 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1318 int spcwid = space_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1319
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1320 if (spcwid >= data->blank_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1321 data->blank_width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1322 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1323 data->blank_width -= spcwid;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1324 }
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 data->start_col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1327 retval = add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1328
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1329 /* Could be caused by the handling of the hscroll rune. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1330 if (retval != NULL || !data->blank_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1331 return retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1332 }
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 /* Blank runes are always calculated to fit. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1335 assert (data->pixpos + data->blank_width <= data->max_pixpos);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1336
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1337 rb.findex = data->findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1338 rb.xpos = data->pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1339 rb.width = data->blank_width;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1340 if (data->byte_charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1341 rb.charpos =
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
1342 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
1343 data->byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1344 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1345 /* #### and this is really correct too? */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1346 rb.charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1347 rb.endpos = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1348 rb.type = RUNE_BLANK;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1349
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1350 if (data->cursor_type == CURSOR_ON)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1351 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1352 if (data->byte_charpos == data->byte_cursor_charpos)
428
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 rb.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1355 data->cursor_x = Dynarr_length (data->db->runes);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1358 rb.cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1359 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1360 else if (data->cursor_type == NEXT_CURSOR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1361 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1362 rb.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1363 data->cursor_x = Dynarr_length (data->db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1364 data->cursor_type = NO_CURSOR;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1367 rb.cursor_type = CURSOR_OFF;
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 Dynarr_add (data->db->runes, rb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1370 data->pixpos += data->blank_width;
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 return NULL;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1375 /* Add runes representing a character in octal. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1376
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1377 #define ADD_NEXT_OCTAL_RUNE_CHAR do \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1378 { \
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1379 if (add_failed || (add_failed = add_ichar_rune (data))) \
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1380 { \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1381 struct prop_block pb; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1382 if (!prop) \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1383 prop = Dynarr_new (prop_block); \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1384 \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1385 pb.type = PROP_CHAR; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1386 pb.data.p_char.ch = data->ch; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1387 pb.data.p_char.cursor_type = data->cursor_type; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1388 Dynarr_add (prop, pb); \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1389 } \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1390 } while (0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1391
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1392 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1393 add_octal_runes (pos_data *data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1394 {
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1395 prop_block_dynarr *add_failed, *prop = 0;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1396 Ichar orig_char = data->ch;
647
b39c14581166 [xemacs-hg @ 2001-08-13 04:45:47 by ben]
ben
parents: 638
diff changeset
1397 int orig_cursor_type = data->cursor_type;
428
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 /* Initialize */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1400 add_failed = NULL;
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 data->start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1404
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1405 if (!data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1406 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1407 if (data->byte_start_col_enabled)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1408 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1409 add_failed = add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1410 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1411 else
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 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1414 struct window *w = XWINDOW (data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1415
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1416 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1417 gb.glyph = Voctal_escape_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1418 add_failed =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1419 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1420 GLYPH_CACHEL (w, OCT_ESC_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1421 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1422 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1423
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1424 /* We only propagate information if the glyph was partially
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1425 added. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1426 if (add_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1427 return add_failed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1429 data->cursor_type = IGNORE_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1430
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1431 if (data->ch >= 0x100)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1432 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1433 /* 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
1434 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
1435 octal number. This is not that pretty, but whatever. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1436 data->ch = (7 & (orig_char >> 18)) + '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 >> 15)) + '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 >> 12)) + '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 data->ch = (7 & (orig_char >> 9)) + '0';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1446 ADD_NEXT_OCTAL_RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1447 }
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 >> 6)) + '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 >> 3)) + '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->ch = (7 & orig_char) + '0';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1456 ADD_NEXT_OCTAL_RUNE_CHAR;
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 data->cursor_type = orig_cursor_type;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1459 return NULL;
428
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1462 #undef ADD_NEXT_OCTAL_RUNE_CHAR
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1463
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1464 /* Add runes representing a control character to a display block. */
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 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1467 add_control_char_runes (pos_data *data, struct buffer *b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1468 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1469 if (!NILP (b->ctl_arrow))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1470 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1471 prop_block_dynarr *prop;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1472 Ichar orig_char = data->ch;
647
b39c14581166 [xemacs-hg @ 2001-08-13 04:45:47 by ben]
ben
parents: 638
diff changeset
1473 int old_cursor_type = data->cursor_type;
428
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 /* Initialize */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1476 prop = NULL;
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 data->start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1480
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1481 if (!data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1482 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1483 if (data->byte_start_col_enabled)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1484 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1485 prop_block_dynarr *retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1486
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1487 retval = add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1488 if (retval)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1489 return retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1490 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1491 else
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 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1494 struct window *w = XWINDOW (data->window);
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 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1497 gb.glyph = Vcontrol_arrow_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1498
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1499 /* We only propagate information if the glyph was partially
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1500 added. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1501 if (add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1502 GLYPH_CACHEL (w, CONTROL_GLYPH_INDEX)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1503 return ADD_FAILED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1504 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1505 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1506
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1507 if (orig_char == 0177)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1508 data->ch = '?';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1509 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1510 data->ch = orig_char ^ 0100;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1511 data->cursor_type = IGNORE_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1512
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1513 if (add_ichar_rune (data))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1514 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1515 struct prop_block pb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1516 if (!prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1517 prop = Dynarr_new (prop_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1518
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1519 pb.type = PROP_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1520 pb.data.p_char.ch = data->ch;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1521 pb.data.p_char.cursor_type = data->cursor_type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1522 Dynarr_add (prop, pb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1523 }
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 data->cursor_type = old_cursor_type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1526 return prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1527 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1528 else
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 return add_octal_runes (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1531 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1532 }
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 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1535 add_disp_table_entry_runes_1 (pos_data *data, Lisp_Object entry)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1536 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1537 prop_block_dynarr *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1538
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1539 if (STRINGP (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1540 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1541 prop = add_ibyte_string_runes (data,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1542 XSTRING_DATA (entry),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1543 XSTRING_LENGTH (entry),
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1544 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1545 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1546 else if (GLYPHP (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1547 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1548 if (data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1549 data->start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1550
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1551 if (!data->start_col && data->byte_start_col_enabled)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1552 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1553 prop = add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1554 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1555 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1556 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1557 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1558
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1559 gb.glyph = entry;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1560 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1561 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1564 else if (CHAR_OR_CHAR_INTP (entry))
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 data->ch = XCHAR_OR_CHAR_INT (entry);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1567 prop = add_ichar_rune (data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1568 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1569 else if (CONSP (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1570 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1571 if (EQ (XCAR (entry), Qformat)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1572 && CONSP (XCDR (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1573 && STRINGP (XCAR (XCDR (entry))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1574 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1575 Lisp_Object format = XCAR (XCDR (entry));
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
1576 Bytebpos len = XSTRING_LENGTH (format);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1577 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
1578 Ibyte *result = alloca_ibytes (len);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1579 Ibyte *dst = result;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1580
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1581 while (src < end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1582 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1583 Ichar c = itext_ichar (src);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1584 INC_IBYTEPTR (src);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1585 if (c != '%' || src == end)
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1586 dst += set_itext_ichar (dst, c);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1587 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1588 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1589 c = itext_ichar (src);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1590 INC_IBYTEPTR (src);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1591 switch (c)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1592 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1593 /*case 'x':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1594 dst += long_to_string_base ((char *)dst, data->ch, 16);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1595 break;*/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1596 case '%':
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1597 dst += set_itext_ichar (dst, '%');
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1598 break;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1599 /* #### unimplemented */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1600 }
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 }
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1603 prop = add_ibyte_string_runes (data, result, dst - result, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1604 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1605 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1606
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1607 /* 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
1608 have any safe way of signaling an error. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1609 return prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1610 }
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 /* Given a display table entry, call the appropriate functions to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1613 display each element of the 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 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1616 add_disp_table_entry_runes (pos_data *data, Lisp_Object entry)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1617 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1618 prop_block_dynarr *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1619 if (VECTORP (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1620 {
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1621 Lisp_Vector *de = XVECTOR (entry);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1622 EMACS_INT len = vector_length (de);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1623 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1624
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1625 for (elt = 0; elt < len; elt++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1626 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1627 if (NILP (vector_data (de)[elt]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1628 continue;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1629 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1630 prop = add_disp_table_entry_runes_1 (data, vector_data (de)[elt]);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1631 /* Else blow it off because someone added a bad entry and we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1632 don't have any safe way of signaling an error. Hey, this
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1633 comment sounds familiar. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1634
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1635 /* #### 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
1636 propagation information. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1637 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1638 return prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1639 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1640 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1641 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1642 prop = add_disp_table_entry_runes_1 (data, entry);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1643 return prop;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1646 /* Add runes which were propagated from the previous line. */
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 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1649 add_propagation_runes (prop_block_dynarr **prop, pos_data *data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1650 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1651 /* #### Remember to handle start_col parameter of data when the rest of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1652 this is finished. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1653 /* #### Chuck -- I've redone this function a bit. It looked like the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1654 case of not all the propagation blocks being added was not handled
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1655 well. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1656 /* #### Chuck -- I also think the double indirection of PROP is kind
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1657 of bogus. A cleaner solution is just to check for
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1658 Dynarr_length (prop) > 0. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1659 /* #### This function also doesn't even pay attention to ADD_FAILED!
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1660 This is seriously fucked! Seven ####'s in 130 lines -- is that a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1661 record? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1662 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1663 prop_block_dynarr *add_failed;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1664 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
1665 int old_cursor_type = data->cursor_type;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1666
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1667 for (elt = 0; elt < Dynarr_length (*prop); elt++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1668 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1669 struct prop_block *pb = Dynarr_atp (*prop, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1670
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1671 switch (pb->type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1672 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1673 case PROP_CHAR:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1674 data->ch = pb->data.p_char.ch;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1675 data->byte_cursor_charpos = pb->data.p_char.byte_cursor_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1676 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
1677 add_failed = add_ichar_rune (data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1678
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1679 if (add_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1680 goto oops_no_more_space;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1681 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1682 case PROP_STRING:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1683 if (pb->data.p_string.str)
1726
a8d8f419b459 [xemacs-hg @ 2003-09-30 15:26:34 by james]
james
parents: 1708
diff changeset
1684 xfree (pb->data.p_string.str, Ibyte *);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1685 /* #### bogus bogus -- this doesn't do anything!
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1686 Should probably call add_ibyte_string_runes(),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1687 once that function is fixed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1688 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1689 case PROP_MINIBUF_PROMPT:
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 face_index old_findex = data->findex;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1692 Bytebpos byte_old_charpos = data->byte_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1693
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1694 data->findex = DEFAULT_INDEX;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1695 data->byte_charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1696 data->cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1697
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1698 while (pb->data.p_string.len > 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1699 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1700 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
1701 add_failed = add_ichar_rune (data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1702
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1703 if (add_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1704 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1705 data->findex = old_findex;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1706 data->byte_charpos = byte_old_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1707 goto oops_no_more_space;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1708 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1709 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1710 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1711 /* Complicated equivalent of ptr++, len-- */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1712 Ibyte *oldpos = pb->data.p_string.str;
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1713 INC_IBYTEPTR (pb->data.p_string.str);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1714 pb->data.p_string.len -= pb->data.p_string.str - oldpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1715 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1716 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1717
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1718 data->findex = old_findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1719 /* ##### FIXME FIXME FIXME -- Upon successful return from
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1720 this function, data->byte_charpos is automatically incremented.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1721 However, we don't want that to happen if we were adding
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1722 the minibuffer prompt. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1723 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1724 struct buffer *buf =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1725 XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1726 /* #### 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
1727 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
1728 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
1729 else
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1730 /* #### is this correct? Does anyone know?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1731 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
1732 data->byte_charpos = BYTE_BUF_BEGV (buf) - 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1733 }
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 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1736 case PROP_BLANK:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1737 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1738 /* #### I think it's unnecessary and misleading to preserve
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1739 the blank_width, as it implies that the value carries
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1740 over from one rune to the next, which is wrong. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1741 int old_width = data->blank_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1742 face_index old_findex = data->findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1743
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1744 data->findex = pb->data.p_blank.findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1745 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
1746 data->byte_cursor_charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1747 data->cursor_type = IGNORE_CURSOR;
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 if (data->pixpos + data->blank_width > data->max_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1750 data->blank_width = data->max_pixpos - data->pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1751
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1752 /* 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
1753 matter because unless something is really screwed up
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
1754 this call won't cause that arg to be used. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1755 add_failed = add_blank_rune (data, XWINDOW (data->window), 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1756
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1757 /* 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
1758 is wider than the window. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1759 if (data->blank_width != pb->data.p_blank.width)
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 pb->data.p_blank.width -= data->blank_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1762 add_failed = ADD_FAILED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1763 }
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 data->findex = old_findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1766 data->blank_width = old_width;
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 if (add_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1769 goto oops_no_more_space;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1770 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1771 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1772 default:
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
1773 ABORT ();
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1774 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1775 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1776
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1777 oops_no_more_space:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1778
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1779 data->byte_cursor_charpos = byte_old_cursor_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1780 data->cursor_type = old_cursor_type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1781 if (elt < Dynarr_length (*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 Dynarr_delete_many (*prop, 0, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1784 return *prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1785 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1786 else
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 Dynarr_free (*prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1789 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1790 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1791 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1792
3025
facf3239ba30 [xemacs-hg @ 2005-10-25 11:16:19 by ben]
ben
parents: 2552
diff changeset
1793 /* 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
1794 the display block, but add all other types to the appropriate list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1795 of the display line. They will be added later by different
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1796 routines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1797
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1798 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1799 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
1800 int allow_cursor, struct glyph_cachel *cachel)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1801 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1802 struct window *w = XWINDOW (data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1803
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1804 /* If window faces changed, and glyph instance is text, then
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1805 glyph sizes might have changed too */
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1806 invalidate_glyph_geometry_maybe (gb->glyph, w);
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1807
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1808 /* This makes sure the glyph is in the cachels.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1809
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1810 #### 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
1811 so that the dirty flag can be reset after redisplay has
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1812 finished. We should do this some other way, maybe by iterating
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1813 over the window cache of subwindows. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1814 get_glyph_cachel_index (w, gb->glyph);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1815
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1816 /* A nil extent indicates a special glyph (ex. truncator). */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1817 if (NILP (gb->extent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1818 || (pos_type == BEGIN_GLYPHS &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1819 extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1820 || (pos_type == END_GLYPHS &&
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1821 extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1822 || pos_type == LEFT_GLYPHS || pos_type == RIGHT_GLYPHS)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1823 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1824 struct rune rb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1825 int width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1826 int xoffset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1827 int ascent, descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1828 Lisp_Object baseline;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1829 Lisp_Object face;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1830 Lisp_Object instance;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1831 face_index findex;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1832 prop_block_dynarr *retval = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1833
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1834 if (cachel)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1835 width = cachel->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1836 else
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
1837 width = glyph_width (gb->glyph, data->window);
428
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 (!width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1840 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1841
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1842 if (data->start_col || data->start_col_xoffset)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1843 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1844 int glyph_char_width = width / space_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1845
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1846 /* 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
1847 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
1848 width and return. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1849 if (glyph_char_width < data->start_col)
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 data->start_col -= glyph_char_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1852 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1853 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1854 else if (glyph_char_width == data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1855 width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1856 else
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 xoffset = space_width (w) * data->start_col;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1859 width -= xoffset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1860
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1861 /* #### Can this happen? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1862 if (width < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1863 width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1864 }
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 data->start_col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1867 retval = add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1868
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1869 /* Could be caused by the handling of the hscroll rune. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1870 if (retval != NULL || !width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1871 return retval;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1874 xoffset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1875
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1876 if (data->pixpos + width > data->max_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1877 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1878 /* 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
1879 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
1880 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
1881 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
1882 than the window. We could alternatively just completely
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1883 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
1884 this is a better solution.
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
1885
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1886 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
1887 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
1888 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
1889 start-glyph that covers multitple following
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1890 characters. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1891 if (Dynarr_length (data->db->runes)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1892 && data->max_pixpos - data->pixpos < horizontal_clip)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1893 return ADD_FAILED;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1894 else {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1895 struct prop_block pb;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1896
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1897 /* 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
1898 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
1899 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
1900 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
1901 search the runes in create_text_block(). */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1902 if (data->ch == '\n')
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1903 data->max_pixpos += data->end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1904 width = data->max_pixpos - data->pixpos;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1905 /* 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
1906 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
1907 again. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1908 retval = Dynarr_new (prop_block);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1909 pb.type = PROP_GLYPH;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1910 pb.data.p_glyph.glyph = gb->glyph;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1911 pb.data.p_glyph.width = width;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1912 Dynarr_add (retval, pb);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1913 }
428
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1916 if (cachel)
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 ascent = cachel->ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1919 descent = cachel->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1920 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1921 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1922 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
1923 ascent = glyph_ascent (gb->glyph, data->window);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
1924 descent = glyph_descent (gb->glyph, data->window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1925 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1926
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1927 baseline = glyph_baseline (gb->glyph, data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1928
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1929 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
1930
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1931 if (glyph_contrib_p (gb->glyph, data->window))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1932 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1933 /* A pixmap that has not had a baseline explicitly set. Its
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1934 contribution will be determined later. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1935 if (NILP (baseline))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1936 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1937 int height = ascent + descent;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1938 data->need_baseline_computation = 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1939 data->max_pixmap_height = max (data->max_pixmap_height, height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1940 }
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 /* A string so determine contribution normally. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1943 else if (EQ (baseline, Qt))
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 data->new_ascent = max (data->new_ascent, ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1946 data->new_descent = max (data->new_descent, descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1947 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1948
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1949 /* A pixmap with an explicitly set baseline. We determine the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1950 contribution here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1951 else if (INTP (baseline))
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 int height = ascent + descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1954 int pix_ascent, pix_descent;
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 pix_ascent = height * XINT (baseline) / 100;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1957 pix_descent = height - pix_ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1958
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1959 data->new_ascent = max (data->new_ascent, pix_ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1960 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
1961 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
1962
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1963 rb.object.dglyph.descent = pix_descent;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1964 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1965
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1966 /* Otherwise something is screwed up. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1967 else
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
1968 ABORT ();
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1969 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1970
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1971 face = glyph_face (gb->glyph, data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1972 if (NILP (face))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1973 findex = data->findex;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1974 else
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1975 findex = get_builtin_face_cache_index (w, face);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1976
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1977 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
1978 ERROR_ME_DEBUG_WARN, 1);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1979 if (TEXT_IMAGE_INSTANCEP (instance))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1980 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1981 Lisp_Object string = XIMAGE_INSTANCE_TEXT_STRING (instance);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1982 face_index orig_findex = data->findex;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1983 Bytebpos orig_charpos = data->byte_charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1984 Bytebpos orig_start_col_enabled = data->byte_start_col_enabled;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1985
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1986 data->findex = findex;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1987 data->byte_start_col_enabled = 0;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1988 if (!allow_cursor)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1989 data->byte_charpos = 0;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1990 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
1991 XSTRING_LENGTH (string), 0, 1);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1992 data->findex = orig_findex;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1993 data->byte_charpos = orig_charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1994 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
1995 return retval;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1996 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1997
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1998 rb.findex = findex;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1999 rb.xpos = data->pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2000 rb.width = width;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2001 rb.charpos = 0; /* glyphs are never "at" anywhere */
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2002 if (data->byte_endpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2003 /* #### is this necessary at all? */
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
2004 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
2005 data->byte_endpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2006 else
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2007 rb.endpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2008 rb.type = RUNE_DGLYPH;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2009 rb.object.dglyph.glyph = gb->glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2010 rb.object.dglyph.extent = gb->extent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2011 rb.object.dglyph.xoffset = xoffset;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2012 rb.object.dglyph.ascent = ascent;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2013 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
2014 a normal (textual) baseline. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2015
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2016 if (allow_cursor)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2017 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2018 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
2019 data->byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2020
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2021 if (data->cursor_type == CURSOR_ON)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2022 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2023 if (data->byte_charpos == data->byte_cursor_charpos)
428
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 rb.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2026 data->cursor_x = Dynarr_length (data->db->runes);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2029 rb.cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2030 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2031 else if (data->cursor_type == NEXT_CURSOR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2032 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2033 rb.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2034 data->cursor_x = Dynarr_length (data->db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2035 data->cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2036 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2037 else if (data->cursor_type == IGNORE_CURSOR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2038 rb.cursor_type = IGNORE_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2039 else if (data->cursor_type == NO_CURSOR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2040 rb.cursor_type = NO_CURSOR;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2045 rb.cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2046
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2047 Dynarr_add (data->db->runes, rb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2048 data->pixpos += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2049
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2050 return retval;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2051 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2052 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2053 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2054 if (!NILP (glyph_face (gb->glyph, data->window)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2055 gb->findex =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2056 get_builtin_face_cache_index (w, glyph_face (gb->glyph,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2057 data->window));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2058 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2059 gb->findex = data->findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2060
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2061 if (pos_type == BEGIN_GLYPHS)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2062 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2063 if (!data->dl->left_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2064 data->dl->left_glyphs = Dynarr_new (glyph_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2065 Dynarr_add (data->dl->left_glyphs, *gb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2066 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2067 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2068 else if (pos_type == END_GLYPHS)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2069 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2070 if (!data->dl->right_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2071 data->dl->right_glyphs = Dynarr_new (glyph_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2072 Dynarr_add (data->dl->right_glyphs, *gb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2073 return NULL;
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 else
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
2076 ABORT (); /* there are no unknown types */
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
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2079 return NULL;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2080 }
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 /* 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
2083 data. */
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 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2086 add_glyph_runes (pos_data *data, int pos_type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2087 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2088 /* #### This still needs to handle the start_col parameter. Duh, Chuck,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2089 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
2090 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2091 glyph_block_dynarr *glyph_arr = (pos_type == BEGIN_GLYPHS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2092 ? data->ef->begin_glyphs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2093 : data->ef->end_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2094 prop_block_dynarr *prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2095
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2096 for (elt = 0; elt < Dynarr_length (glyph_arr); elt++)
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 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
2099 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2100
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2101 if (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 /* #### Add some propagation information. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2104 return prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2105 }
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2108 Dynarr_reset (glyph_arr);
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 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2111 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2112
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2113 /* 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
2114 display line DL accurately represents the text on a line starting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2115 at the given position.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2116
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2117 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
2118 You must do appropriate conversion. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2119
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
2120 static Bytebpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2121 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
2122 Bytebpos byte_start_pos, prop_block_dynarr **prop,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2123 int type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2124 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2125 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2126 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2127 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2128
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2129 pos_data data;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2130
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2131 /* 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
2132 a selected frame. We consider all other windows to be active
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2133 minibuffers as it simplifies the coding. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2134 int active_minibuffer = (!MINI_WINDOW_P (w) ||
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2135 (f == device_selected_frame (d)) ||
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2136 is_surrogate_for_selected_frame (f));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2137
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2138 int truncate_win = window_truncation_on (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2139
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2140 /* If the buffer's value of selective_display is an integer then
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2141 only lines that start with less than selective_display columns of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2142 space will be displayed. If selective_display is t then all text
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2143 after a ^M is invisible. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2144 int selective = (INTP (b->selective_display)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2145 ? XINT (b->selective_display)
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
2146 : (!NILP (b->selective_display) ? -1 : 0));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2147
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2148 /* The variable ctl-arrow allows the user to specify what characters
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2149 can actually be displayed and which octal should be used for.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2150 #### This variable should probably have some rethought done to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2151 it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2152
2367
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
2153 See also
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
2154
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
2155 (Info-goto-node "(internals)Future Work -- Display Tables")
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
2156
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
2157 */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2158 Ichar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2159 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2160 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2161 ? 255 : 160));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2162
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2163 Lisp_Object face_dt, window_dt;
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 text display block for this display line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2166 struct display_block *db = get_display_block_from_line (dl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2167
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2168 /* 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
2169 data to be updated. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2170 int initial = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2171
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2172 /* Apparently the new extent_fragment_update returns an end position
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2173 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
2174 displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2175 int no_more_frags = 0;
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 Lisp_Object synch_minibuffers_value =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2178 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2179
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2180 dl->used_prop_data = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2181 dl->num_chars = 0;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2182 dl->line_continuation = 0;
428
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 xzero (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2185 data.ef = extent_fragment_new (w->buffer, f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2186
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2187 /* 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
2188 them to this structure for ease of passing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2189 data.d = d;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
2190 data.window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2191 data.string = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2192 data.db = db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2193 data.dl = dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2194
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2195 data.byte_charpos = byte_start_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2196 data.pixpos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2197 data.last_charset = Qunbound;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2198 data.last_findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2199 data.result_str = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2200
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2201 /* Set the right boundary adjusting it to take into account any end
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2202 glyph. Save the width of the end glyph for later use. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2203 data.max_pixpos = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2204 if (truncate_win)
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2205 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2206 else
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2207 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
2208 data.max_pixpos -= data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2209
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2210 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
2211 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2212 data.byte_cursor_charpos = BYTE_BUF_ZV (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2213 data.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2214 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2215 else if (MINI_WINDOW_P (w) && !active_minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2216 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2217 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2218 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2219 d == XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d))))&&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2220 f == XFRAME(DEVICE_SELECTED_FRAME(d)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2221 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2222 data.byte_cursor_charpos = BYTE_BUF_PT (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2223 data.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2224 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2225 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2226 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2227 data.byte_cursor_charpos = byte_marker_position (w->pointm[type]);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2228 data.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2229 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2230 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2231 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2232 data.cursor_x = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2233
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2234 data.start_col = w->hscroll;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2235 data.start_col_xoffset = w->left_xoffset;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2236 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2237 data.hscroll_glyph_width_adjust = 0;
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 /* We regenerate the line from the very beginning. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2240 Dynarr_reset (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2241
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2242 /* 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
2243 starting position is already equal to the maximum we can't add
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2244 anything else, right? Wrong. We might still have a newline to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2245 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
2246 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
2247 glyph. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2248
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2249 /* #### Chuck -- I think this condition should be while (1).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2250 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
2251 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
2252 end-glyph and text might not be displayed. while (1) ensures
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2253 that the loop terminates only when either (a) there is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2254 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
2255
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2256 #### Also I think you need to ensure that the operation
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2257 "add begin glyphs; add end glyphs; add text" is atomic and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2258 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
2259 of the line during that operation, then you keep accumulating
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2260 propagation data until you're done. Otherwise, if the (e.g.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2261 there's a begin glyph at a particular position and attempting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2262 to display that glyph results in window-end being hit and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2263 propagation data being generated, then the character at that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2264 position won't be displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2265
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2266 #### See also the comment after the end of this loop, below.
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 while (data.pixpos <= data.max_pixpos
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2269 && (active_minibuffer || !NILP (synch_minibuffers_value)))
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 /* #### This check probably should not be necessary. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2272 if (data.byte_charpos > BYTE_BUF_ZV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2273 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2274 /* #### urk! More of this lossage! */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2275 data.byte_charpos--;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2276 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2277 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2278
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2279 /* 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
2280 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
2281 supposed to display. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2282 if (selective > 0
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2283 && (data.byte_charpos == BYTE_BUF_BEGV (b)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2284 || 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
2285 {
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2286 while (byte_spaces_at_point (b, data.byte_charpos) >= selective)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2287 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2288 data.byte_charpos =
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2289 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
2290 if (data.byte_charpos >= BYTE_BUF_ZV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2291 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2292 data.byte_charpos = BYTE_BUF_ZV (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2293 goto done;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2296 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2297
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2298 /* Check for face changes. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2299 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2300 {
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2301 Lisp_Object last_glyph = Qnil;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2302
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2303 /* 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
2304 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
2305 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
2306 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
2307 works because we always recalculate the extent-fragments
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2308 for propagated data, we never actually propagate the
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2309 fragments that still need to be displayed. */
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2310 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
2311 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2312 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
2313 Dynarr_free (*prop);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2314 *prop = 0;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2315 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2316 /* Now compute the face and begin/end-glyph information. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2317 data.findex =
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
2318 /* 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
2319 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2320
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2321 get_display_tables (w, data.findex, &face_dt, &window_dt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2322
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2323 if (data.byte_charpos == data.ef->end)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2324 no_more_frags = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2325 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2326 initial = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2327
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2328 /* 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
2329 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
2330 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
2331 current buffer position. */
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 /* 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
2334 nothing (except maybe add some ellipses).
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2335
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2336 #### The behavior of begin and end-glyphs at the edge of an
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2337 invisible extent should be investigated further. This is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2338 fairly low priority though. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2339 if (data.ef->invisible)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2340 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2341 /* #### Chuck, perhaps you could look at this code? I don't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2342 really know what I'm doing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2343 if (*prop)
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 Dynarr_free (*prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2346 *prop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2347 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2348
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2349 /* The extent fragment code only sets this when we should
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2350 really display the ellipses. It makes sure the ellipses
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2351 don't get displayed more than once in a row. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2352 if (data.ef->invisible_ellipses)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2353 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2354 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2355
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2356 data.ef->invisible_ellipses_already_displayed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2357 data.ef->invisible_ellipses = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2358 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2359 gb.glyph = Vinvisible_text_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2360 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2361 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2362 /* Perhaps they shouldn't propagate if the very next thing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2363 is to display a newline (for compatibility with
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2364 selective-display-ellipses)? Maybe that's too
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2365 abstruse. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2366 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2367 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2368 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2369
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2370 /* 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
2371 next visible character. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2372 if (data.cursor_type == CURSOR_ON
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2373 && data.byte_charpos == data.byte_cursor_charpos)
428
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 data.cursor_type = NEXT_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2376 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2377
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2378 /* #### What if we we're dealing with a display table? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2379 if (data.start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2380 data.start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2381
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2382 if (data.byte_charpos == BYTE_BUF_ZV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2383 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2384 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2385 INC_BYTEBPOS (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2386 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2387
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2388 /* 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
2389 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
2390 position counter. This might also add the minibuffer
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2391 prompt. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2392 else if (*prop)
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 dl->used_prop_data = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2395 *prop = add_propagation_runes (prop, &data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2396
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2397 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2398 goto done; /* gee, a really narrow window */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2399 else if (data.byte_charpos == BYTE_BUF_ZV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2400 goto done;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2401 else if (data.byte_charpos < BYTE_BUF_BEGV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2402 /* #### 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
2403 data.byte_charpos = BYTE_BUF_BEGV (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2404 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2405 INC_BYTEBPOS (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2406 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2407
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2408 /* If there are end glyphs, add them to the line. These are
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2409 the end glyphs for the previous run of text. We add them
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2410 here rather than doing them at the end of handling the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2411 previous run so that glyphs at the beginning and end of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2412 a line are handled correctly. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2413 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
2414 || Dynarr_length (data.ef->begin_glyphs) > 0)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2415 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2416 glyph_block_dynarr* tmpglyphs = 0;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2417 /* #### 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
2418 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
2419
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2420 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
2421 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2422 *prop = add_glyph_runes (&data, END_GLYPHS);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2423 tmpglyphs = data.ef->end_glyphs;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2424 }
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 /* 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
2427 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
2428 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2429 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2430 tmpglyphs = data.ef->begin_glyphs;
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
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2433 if (*prop)
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2434 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2435 /* 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
2436 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
2437 appropriate processing to not get a continuation
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2438 glyph. */
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
2439 if (*prop != ADD_FAILED
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
2440 && Dynarr_begin (*prop)->type == PROP_GLYPH
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2441 && data.ch == '\n')
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2442 {
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2443 /* 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
2444 processing.
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2445
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2446 #### 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
2447 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
2448 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
2449 which might be problematic since the fragment is
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2450 recalculated for each line. */
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
2451 if (EQ (Dynarr_lastp (tmpglyphs)->glyph,
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
2452 Dynarr_begin (*prop)->data.p_glyph.glyph))
819
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 Dynarr_free (*prop);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2455 *prop = 0;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2456 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2457 else {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2458 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
2459 add_ichar_rune (&data); /* discard prop data. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2460 goto done;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2461 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2462 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2463 else
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2464 goto done;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2465 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2466 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2467
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2468 /* If at end-of-buffer, we've already processed begin and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2469 end-glyphs at this point and there's no text to process,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2470 so we're done. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2471 else if (data.byte_charpos == BYTE_BUF_ZV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2472 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2473
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2474 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2475 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2476 Lisp_Object entry = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2477 /* 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
2478 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2479 if (!NILP (face_dt) || !NILP (window_dt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2480 entry = display_table_entry (data.ch, face_dt, window_dt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2481
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2482 /* 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
2483 add_disp_table_entry_runes and let it worry about it. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2484 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2485 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2486 *prop = add_disp_table_entry_runes (&data, entry);
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 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2489 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2490 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2491
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2492 /* 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
2493 to the line and end this loop. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2494 else if (data.ch == '\n')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2495 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2496 /* 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
2497 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
2498 fit. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2499 data.max_pixpos += data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2500
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2501 if (selective > 0
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2502 && (byte_spaces_at_point
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2503 (b, next_bytebpos (b, data.byte_charpos))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2504 >= selective))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2505 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2506 if (!NILP (b->selective_display_ellipses))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2507 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2508 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2509
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2510 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2511 gb.glyph = Vinvisible_text_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2512 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2513 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2514 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2515 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2516 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2517 /* Cheesy, cheesy, cheesy. We mark the end of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2518 line with a special "character rune" whose width
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2519 is the EOL cursor width and whose character is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2520 the non-printing character '\n'. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2521 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
2522 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2523 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2524
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2525 /* 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
2526 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
2527 appear to contain all of the invisible area.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2528 Otherwise, the line cache won't work
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2529 correctly. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2530 INC_BYTEBPOS (b, data.byte_charpos);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2531 while (byte_spaces_at_point (b, data.byte_charpos) >= selective)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2532 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2533 data.byte_charpos =
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2534 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
2535 if (data.byte_charpos >= BYTE_BUF_ZV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2536 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2537 data.byte_charpos = BYTE_BUF_ZV (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2538 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2539 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2540 }
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2541 if (BYTE_BUF_FETCH_CHAR
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2542 (b, prev_bytebpos (b, data.byte_charpos)) == '\n')
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2543 DEC_BYTEBPOS (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2544 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2545 else
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 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
2548 *prop = add_ichar_rune (&data);
428
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 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2552 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2553
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2554 /* 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
2555 enabled, then add the invisible-text-glyph if
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2556 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
2557 line is done. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2558 else if (data.ch == (('M' & 037)) && selective == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2559 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2560 Bytebpos byte_next_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2561
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2562 /* 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
2563 byte_next_charpos =
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2564 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
2565 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
2566 == '\n')
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2567 DEC_BYTEBPOS (b, byte_next_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2568
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2569 /* 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
2570 sure that the cursor gets drawn appropriately. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2571 if (data.cursor_type == CURSOR_ON
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2572 && (data.byte_cursor_charpos >= data.byte_charpos &&
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2573 data.byte_cursor_charpos < byte_next_charpos))
428
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 data.cursor_type = NEXT_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2576 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2577
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2578 /* 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
2579 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
2580 data.max_pixpos += data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2581
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2582 if (!NILP (b->selective_display_ellipses))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2583 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2584 /* 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
2585 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
2586 intentional. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2587 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2588
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2589 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2590 gb.glyph = Vinvisible_text_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2591 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2592 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2593 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2594
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2595 /* 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
2596 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
2597 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
2598 needed). */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2599 data.byte_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 if (NILP (b->selective_display_ellipses)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2602 || data.byte_cursor_charpos == byte_next_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2603 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2604 /* 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
2605 that the cursor shows up properly. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2606 data.ch = '\n';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2607 data.blank_width = DEVMETH (d, eol_cursor_width, ());
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2608 data.findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2609 data.start_col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2610 data.start_col_xoffset = 0;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2611 data.byte_start_col_enabled = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2612
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2613 add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2614 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2615
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2616 /* 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
2617 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
2618 need to abort here. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2619 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
428
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 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2622 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2623
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2624 /* 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
2625 just add it. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2626 else if (data.ch >= printable_min)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2627 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2628 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2629 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2630 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2631 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2632
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2633 /* 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
2634 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
2635 current pixel position to that starting position. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2636 else if (data.ch == '\t')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2637 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2638 int tab_start_pixpos = data.pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2639 int next_tab_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2640 int char_tab_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2641 int prop_width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2642
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2643 if (data.start_col > 1)
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
2644 tab_start_pixpos -= (space_width (w) * (data.start_col - 1))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2645 + data.start_col_xoffset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2646
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2647 next_tab_start =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2648 next_tab_position (w, tab_start_pixpos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2649 dl->bounds.left_in +
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2650 data.hscroll_glyph_width_adjust);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2651 if (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 prop_width = next_tab_start - data.max_pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2654 next_tab_start = data.max_pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2655 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2656 data.blank_width = next_tab_start - data.pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2657 char_tab_width =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2658 (next_tab_start - tab_start_pixpos) / space_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2659
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2660 *prop = add_blank_rune (&data, w, char_tab_width);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2661
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2662 /* 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
2663 sizes guaranteed to fit in the available space. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2664 assert (!(*prop));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2665
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2666 if (prop_width)
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 struct prop_block pb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2669 *prop = Dynarr_new (prop_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2670
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2671 pb.type = PROP_BLANK;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2672 pb.data.p_blank.width = prop_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2673 pb.data.p_blank.findex = data.findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2674 Dynarr_add (*prop, pb);
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 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2677 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2678 }
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 /* 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
2681 add_control_char_runes.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2682
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2683 The is_*() routines have undefined results on
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2684 arguments outside of the range [-1, 255]. (This
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2685 often bites people who carelessly use `char' instead
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2686 of `unsigned char'.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2687 */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2688 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2689 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2690 *prop = add_control_char_runes (&data, b);
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 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2693 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2694 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2695
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2696 /* 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
2697 already handled it, then print it as an octal number. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2698 else if (data.ch >= 0200)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2699 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2700 *prop = add_octal_runes (&data);
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 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2703 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2704 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2705
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2706 /* 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
2707 then just add it. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2708 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2709 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2710 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2711 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2712 goto done;
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
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2715 INC_BYTEBPOS (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2716 }
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2719 done:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2720
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2721 /* 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
2722 end of the buffer. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2723 if (data.byte_charpos < BYTE_BUF_ZV (b)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2724 && (active_minibuffer || !NILP (synch_minibuffers_value)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2725 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2726 /* #### This check is not correct. If the line terminated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2727 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
2728 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
2729 you make the two changes mentioned at the top of this loop,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2730 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
2731 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
2732 check. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2733
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2734 /* 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
2735 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
2736 position. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2737 if (data.ch == '\n')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2738 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2739 /* 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
2740 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
2741 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
2742 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
2743 if (data.byte_start_col_enabled)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2744 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2745 if (data.cursor_type == CURSOR_ON)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2746 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2747 if (data.byte_cursor_charpos >= byte_start_pos
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2748 && data.byte_cursor_charpos <= data.byte_charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2749 data.byte_cursor_charpos = data.byte_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2750 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2751 data.findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2752 data.start_col = 0;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2753 data.byte_start_col_enabled = 0;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2754
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2755 if (data.byte_charpos != byte_start_pos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2756 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2757 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2758
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2759 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2760 gb.glyph = Vhscroll_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2761 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2762 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2763 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2764 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2765 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2766 /* 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
2767 the end of an otherwise empty line.*/
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2768 data.ch = '\n';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2769 data.blank_width = DEVMETH (d, eol_cursor_width, ());
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2770
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2771 add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2772 }
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
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2775 INC_BYTEBPOS (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2776 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2777
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2778 /* 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
2779 line. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2780 else
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 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2783 struct glyph_cachel *cachel;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2784
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2785 /* 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
2786 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
2787 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
2788 we starting laying out the line. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2789 data.max_pixpos += data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2790 data.findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2791 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2792
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2793 if (truncate_win)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2794 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2795 Bytebpos byte_pos;
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 /* 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
2798 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
2799
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2800 /* 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
2801 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
2802 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
2803 appear unless eob is immediately preceded by a
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2804 newline. In that case the cursor should actually
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
2805 appear on the next line. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2806 if (data.cursor_type == CURSOR_ON
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2807 && data.byte_cursor_charpos >= data.byte_charpos
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2808 && (data.byte_cursor_charpos < byte_pos ||
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2809 (byte_pos == BYTE_BUF_ZV (b)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2810 && (byte_pos == BYTE_BUF_BEGV (b)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2811 || (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_pos))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2812 != '\n')))))
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2813 data.byte_cursor_charpos = byte_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2814 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2815 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2816
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2817 data.byte_charpos = byte_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2818 gb.glyph = Vtruncation_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2819 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2820 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2821 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2822 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2823 /* The cursor can never be on the continuation glyph. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2824 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2825
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2826 /* 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
2827
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2828 dl->line_continuation = 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2829 gb.glyph = Vcontinuation_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2830 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2831 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2832
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2833 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2834
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2835 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
2836 && 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
2837 /* #### Damn this losing shit. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2838 data.byte_charpos++;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2839 }
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 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
2842 && (!echo_area_active (f) || data.byte_charpos == BYTE_BUF_ZV (b)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2843 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2844 /* 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
2845 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
2846 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
2847 whitespace routines below. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2848
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2849 data.ch = '\n';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2850 data.blank_width = DEVMETH (d, eol_cursor_width, ());
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2851 data.findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2852 data.start_col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2853 data.start_col_xoffset = 0;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2854 data.byte_start_col_enabled = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2855
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2856 data.max_pixpos += data.blank_width;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2857 add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2858 data.max_pixpos -= data.blank_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2859
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2860 /* #### urk! Chuck, this shit is bad news. Going around
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2861 manipulating invalid positions is guaranteed to result in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2862 trouble sooner or later. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2863 data.byte_charpos = BYTE_BUF_ZV (b) + 1;
428
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2866 /* Calculate left whitespace boundary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2867 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2868 int elt = 0;
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 /* Whitespace past a newline is considered right whitespace. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2871 while (elt < Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2872 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2873 struct rune *rb = Dynarr_atp (db->runes, elt);
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 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2876 || rb->type == RUNE_BLANK)
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 dl->bounds.left_white += rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2879 elt++;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2882 elt = Dynarr_length (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2883 }
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2886 /* Calculate right whitespace boundary. */
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 int elt = Dynarr_length (db->runes) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2889 int done = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2890
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2891 while (!done && elt >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2892 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2893 struct rune *rb = Dynarr_atp (db->runes, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2894
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2895 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2896 && isspace (rb->object.chr.ch))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2897 && !rb->type == RUNE_BLANK)
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 dl->bounds.right_white = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2900 done = 1;
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 elt--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2904
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2905 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2906
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2907 /* The line is blank so everything is considered to be right
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2908 whitespace. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2909 if (!done)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2910 dl->bounds.right_white = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2911 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2912
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2913 /* Set the display blocks bounds. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2914 db->start_pos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2915 if (Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2916 {
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
2917 struct rune *rb = Dynarr_lastp (db->runes);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2918
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2919 db->end_pos = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2920 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2921 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2922 db->end_pos = dl->bounds.right_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2923
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2924 calculate_baseline (&data);
428
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 dl->ascent = data.new_ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2927 dl->descent = data.new_descent;
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 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2930 unsigned short ascent = (unsigned short) XINT (w->minimum_line_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 if (dl->ascent < ascent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2933 dl->ascent = ascent;
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 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2936 unsigned short descent = (unsigned short) XINT (w->minimum_line_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 if (dl->descent < descent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2939 dl->descent = descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2940 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2941
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2942 calculate_yoffset (dl, db);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2943
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2944 dl->cursor_elt = data.cursor_x;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2945 /* #### lossage lossage lossage! Fix this shit! */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2946 if (data.byte_charpos > BYTE_BUF_ZV (b))
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2947 dl->end_charpos = BUF_ZV (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2948 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2949 dl->end_charpos = bytebpos_to_charbpos (b, data.byte_charpos) - 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2950 if (truncate_win)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2951 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
2952 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2953 /* This doesn't correctly take into account tabs and control
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2954 characters but if the window isn't being truncated then this
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2955 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
2956 data.dl->num_chars = dl->end_charpos - dl->charpos;
428
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 horizontally scrolled line with text none of which
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2959 was actually laid out. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2960
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2961 /* #### handle any remainder of overlay arrow */
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 (*prop == ADD_FAILED)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2964 *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2965
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2966 if (truncate_win && *prop)
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 Dynarr_free (*prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2969 *prop = NULL;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2972 extent_fragment_delete (data.ef);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2973
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2974 /* #### 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
2975 it so that regenerate_window will exit properly. This is bogus.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2976 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
2977 this function if we are already at EOB. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2978
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2979 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
2980 return data.byte_charpos + 1; /* Yuck! */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2981 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2982 return data.byte_charpos;
428
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2985 /* Display the overlay arrow at the beginning of the given line. */
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 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2988 create_overlay_glyph_block (struct window *w, struct display_line *dl)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2989 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2990 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2991 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2992 pos_data data;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2993
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2994 /* If Voverlay_arrow_string isn't valid then just fail silently. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2995 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2996 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2997
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2998 xzero (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2999 data.ef = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3000 data.d = d;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3001 data.window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3002 data.db = get_display_block_from_line (dl, OVERWRITE);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3003 data.dl = dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3004 data.pixpos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3005 data.max_pixpos = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3006 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3007 data.cursor_x = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3008 data.findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3009 data.last_charset = Qunbound;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3010 data.last_findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3011 data.result_str = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3012 data.string = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3013
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3014 Dynarr_reset (data.db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3015
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3016 if (STRINGP (Voverlay_arrow_string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3017 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
3018 add_ibyte_string_runes
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3019 (&data,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3020 XSTRING_DATA (Voverlay_arrow_string),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3021 XSTRING_LENGTH (Voverlay_arrow_string),
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3022 1, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3023 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3024 else if (GLYPHP (Voverlay_arrow_string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3025 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3026 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3027
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3028 gb.glyph = Voverlay_arrow_string;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3029 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3030 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3031 }
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3032
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3033 if (data.max_pixmap_height)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3034 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3035 int height = data.new_ascent + data.new_descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3036 int pix_ascent, pix_descent;
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3037
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3038 pix_descent = data.max_pixmap_height * data.new_descent / height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3039 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
3040 calculate_baseline (&data);
428
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 data.new_ascent = max (data.new_ascent, pix_ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3043 data.new_descent = max (data.new_descent, pix_descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3044 }
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 dl->ascent = data.new_ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3047 dl->descent = data.new_descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3048
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3049 data.db->start_pos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3050 data.db->end_pos = data.pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3051
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3052 calculate_yoffset (dl, data.db);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3053
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3054 return data.pixpos - dl->bounds.left_in;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3057 /* Add a type of glyph to a margin display block. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3058
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3059 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3060 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
3061 int count, enum glyph_layout layout, int side, Lisp_Object window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3062 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3063 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3064 ? dl->left_glyphs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3065 : dl->right_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3066 int elt, end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3067 int reverse;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3068 struct window *w = XWINDOW (window);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3069 struct frame *f = XFRAME (w->frame);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3070 struct device *d = XDEVICE (f->device);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3071 pos_data data;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3072
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3073 xzero (data);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3074 data.d = d;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3075 data.window = window;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3076 data.db = db;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3077 data.dl = dl;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3078 data.pixpos = start;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3079 data.cursor_type = NO_CURSOR;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3080 data.cursor_x = -1;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3081 data.last_charset = Qunbound;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3082 data.last_findex = DEFAULT_INDEX;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3083 data.result_str = Qnil;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3084 data.string = Qnil;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3085 data.new_ascent = dl->ascent;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3086 data.new_descent = dl->descent;
428
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 if ((layout == GL_WHITESPACE && side == LEFT_GLYPHS)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3089 || (layout == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3090 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3091 reverse = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3092 elt = Dynarr_length (gbd) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3093 end = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3094 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3095 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3096 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3097 reverse = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3098 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3099 end = Dynarr_length (gbd);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3102 while (count && ((!reverse && elt < end) || (reverse && elt >= end)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3103 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3104 struct glyph_block *gb = Dynarr_atp (gbd, elt);
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 (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3107 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3108
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3109 if (gb->active &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3110 ((side == LEFT_GLYPHS &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3111 extent_begin_glyph_layout (XEXTENT (gb->extent)) == layout)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3112 || (side == RIGHT_GLYPHS &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3113 extent_end_glyph_layout (XEXTENT (gb->extent)) == layout)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3114 {
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3115 data.findex = gb->findex;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3116 data.max_pixpos = data.pixpos + gb->width;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3117 add_glyph_rune (&data, gb, side, 0, NULL);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3118 count--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3119 gb->active = 0;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3122 (reverse ? elt-- : elt++);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3123 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3124
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3125 calculate_baseline (&data);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3126
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3127 dl->ascent = data.new_ascent;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3128 dl->descent = data.new_descent;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3129
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3130 calculate_yoffset (dl, data.db);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3131
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3132 return data.pixpos;
428
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3135 /* Add a blank to a margin display block. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3136
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3137 static void
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
3138 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
3139 struct window *w, int xpos, int width, int side)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3140 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3141 struct rune rb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3142
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3143 rb.findex = (side == LEFT_GLYPHS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3144 ? get_builtin_face_cache_index (w, Vleft_margin_face)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3145 : get_builtin_face_cache_index (w, Vright_margin_face));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3146 rb.xpos = xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3147 rb.width = width;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
3148 rb.charpos = -1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3149 rb.endpos = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3150 rb.type = RUNE_BLANK;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3151 rb.cursor_type = CURSOR_OFF;
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 Dynarr_add (db->runes, rb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3154 }
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 /* Display glyphs in the left outside margin, left inside margin and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3157 left whitespace area. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3158
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3159 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3160 create_left_glyph_block (struct window *w, struct display_line *dl,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3161 int overlay_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3162 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3163 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3164
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3165 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3166 int elt, end_xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3167 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
3168 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
3169 int left_in_start = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3170 int left_in_end = dl->bounds.left_in + overlay_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3171
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3172 struct display_block *odb, *idb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3173
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3174 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3175
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3176 /* 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
3177 inside, whitespace. However the precedence dictates that we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3178 determine how many will fit in the reverse order. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3179
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3180 /* Determine how many whitespace glyphs we can display and where
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3181 they should start. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3182 white_in_start = dl->bounds.left_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3183 white_out_start = left_in_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3184 white_out_cnt = white_in_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3185 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3186
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3187 while (elt < Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3188 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3189 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
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 (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3192 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3193
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3194 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3195 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3196 int width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3197
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3198 width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3199
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3200 if (white_in_start - width >= left_in_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3201 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3202 white_in_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3203 white_in_start -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3204 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3205 gb->active = 1;
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 else if (use_overflow
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3208 && (white_out_start - width > dl->bounds.left_out))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3209 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3210 white_out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3211 white_out_start -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3212 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3213 gb->active = 1;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3216 gb->active = 0;
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 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3220 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3221
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3222 /* Determine how many inside margin glyphs we can display and where
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3223 they should start. The inside margin glyphs get whatever space
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3224 is left after the whitespace glyphs have been displayed. These
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3225 are tricky to calculate since if we decide to use the overflow
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3226 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
3227 list of just the inside margin glyphs and manipulate it to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3228 determine the needed info. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3229 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3230 glyph_block_dynarr *ib;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3231 int avail_in, avail_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3232 int done = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3233 int marker = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3234 int used_in, used_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3235
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3236 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3237 used_in = used_out = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3238 ib = Dynarr_new (glyph_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3239 while (elt < Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3240 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3241 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
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 (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3244 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3245
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3246 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3247 GL_INSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3248 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3249 gb->width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3250 used_in += gb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3251 Dynarr_add (ib, *gb);
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 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3255 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3256
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3257 if (white_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3258 avail_in = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3259 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3260 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3261 avail_in = white_in_start - left_in_end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3262 if (avail_in < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3263 avail_in = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3264 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3265
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3266 if (!use_overflow)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3267 avail_out = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3268 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3269 avail_out = white_out_start - dl->bounds.left_out;
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 marker = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3272 while (!done && marker < Dynarr_length (ib))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3273 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3274 int width = Dynarr_atp (ib, marker)->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3275
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3276 /* 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
3277 space, we're done. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3278 if (used_in <= avail_in)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3279 done = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3280 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3281 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3282 /* 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
3283 outside. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3284 if (used_out + width <= avail_out)
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 used_out += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3287 used_in -= width;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3290 done = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3291 }
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 if (!done)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3294 marker++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3295 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3296
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3297 /* 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
3298 the inside margin and everything before it goes in the outside
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3299 margin. The stuff going into the outside margin is guaranteed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3300 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
3301
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3302 in_in_end = left_in_end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3303 in_out_start = white_out_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3304 in_out_cnt = in_in_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3305
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3306 Dynarr_free (ib);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3307 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3308 while (elt < Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3309 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3310 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
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 (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3313 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3314
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3315 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3316 GL_INSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3317 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3318 int width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3319
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3320 if (used_out)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3321 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3322 in_out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3323 in_out_start -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3324 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3325 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3326 used_out -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3327 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3328 else if (in_in_end + width < white_in_start)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3329 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3330 in_in_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3331 in_in_end += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3332 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3333 gb->active = 1;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3336 gb->active = 0;
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 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3340 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3341 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3342
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3343 /* Determine how many outside margin glyphs we can display. They
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3344 always start at the left outside margin and can only use the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3345 outside margin space. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3346 out_end = dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3347 out_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3348 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3349
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3350 while (elt < Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3351 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3352 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
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 (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3355 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3356
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3357 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3358 GL_OUTSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3359 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3360 int width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3361
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3362 if (out_end + width <= in_out_start)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3363 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3364 out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3365 out_end += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3366 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3367 gb->active = 1;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3370 gb->active = 0;
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 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3374 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3375
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3376 /* Now that we know where everything goes, we add the glyphs as
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3377 runes to the appropriate display blocks. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3378 if (out_cnt || in_out_cnt || white_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3379 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3380 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3381 odb->start_pos = dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3382 /* #### 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
3383 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
3384 this accordingly. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3385 odb->end_pos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3386 Dynarr_reset (odb->runes);
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3389 odb = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3390
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3391 if (in_in_cnt || white_in_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3392 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3393 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3394 idb->start_pos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3395 /* #### See above comment for odb->end_pos */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3396 idb->end_pos = dl->bounds.left_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3397 Dynarr_reset (idb->runes);
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3400 idb = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3401
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3402 /* First add the outside margin glyphs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3403 if (out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3404 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
3405 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3406 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3407 end_xpos = dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3408
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3409 /* There may be blank space between the outside margin glyphs and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3410 the inside margin glyphs. If so, add a blank. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3411 if (in_out_cnt && (in_out_start - end_xpos))
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 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
3414 LEFT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3415 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3416
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3417 /* Next add the inside margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3418 outside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3419 if (in_out_cnt)
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 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
3422 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3423 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3424
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3425 /* 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
3426 but are adding whitespace glyphs, then we need to add a blank
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3427 here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3428 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos))
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 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
3431 LEFT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3432 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3433
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3434 /* Next add the whitespace margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3435 outside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3436 if (white_out_cnt)
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 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
3439 GL_WHITESPACE, LEFT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3440 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3441
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3442 /* 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
3443 start of the inside margin for lines which have glyphs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3444 if (odb && (left_in_start - end_xpos))
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 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
3447 LEFT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3448 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3449
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3450 /* Next add the inside margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3451 inside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3452 if (in_in_cnt)
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 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
3455 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3458 end_xpos = left_in_end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3459
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3460 /* Make sure that the area between the end of the inside margin
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3461 glyphs and the whitespace glyphs is cleared. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3462 if (idb && (white_in_start - end_xpos > 0))
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 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
3465 LEFT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3466 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3467
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3468 /* Next add the whitespace margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3469 inside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3470 if (white_in_cnt)
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 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
3473 LEFT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3474 }
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 /* Whitespace glyphs always end right next to the text block so
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3477 there is nothing we have to make sure is cleared after them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3478 }
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 /* Display glyphs in the right outside margin, right inside margin and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3481 right whitespace area. */
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 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3484 create_right_glyph_block (struct window *w, struct display_line *dl)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3485 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3486 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3487
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3488 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3489 int elt, end_xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3490 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
3491 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
3492
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3493 struct display_block *odb, *idb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3494
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3495 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3496
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3497 /* 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
3498 inside, whitespace. However the precedence dictates that we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3499 determine how many will fit in the reverse order. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3500
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3501 /* Determine how many whitespace glyphs we can display and where
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3502 they should start. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3503 white_in_end = dl->bounds.right_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3504 white_out_end = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3505 white_out_cnt = white_in_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3506 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3507
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3508 while (elt < Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3509 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3510 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
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 (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3513 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3514
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3515 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3516 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3517 int width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3518
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3519 if (white_in_end + width <= dl->bounds.right_in)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3520 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3521 white_in_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3522 white_in_end += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3523 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3524 gb->active = 1;
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 else if (use_overflow
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3527 && (white_out_end + width <= dl->bounds.right_out))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3528 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3529 white_out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3530 white_out_end += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3531 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3532 gb->active = 1;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3535 gb->active = 0;
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 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3539 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3540
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3541 /* Determine how many inside margin glyphs we can display and where
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3542 they should start. The inside margin glyphs get whatever space
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3543 is left after the whitespace glyphs have been displayed. These
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3544 are tricky to calculate since if we decide to use the overflow
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3545 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
3546 list of just the inside margin glyphs and manipulate it to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3547 determine the needed info. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3548 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3549 glyph_block_dynarr *ib;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3550 int avail_in, avail_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3551 int done = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3552 int marker = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3553 int used_in, used_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3554
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3555 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3556 used_in = used_out = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3557 ib = Dynarr_new (glyph_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3558 while (elt < Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3559 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3560 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
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 (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3563 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3564
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3565 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3566 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3567 gb->width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3568 used_in += gb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3569 Dynarr_add (ib, *gb);
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 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3573 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3574
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3575 if (white_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3576 avail_in = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3577 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3578 avail_in = dl->bounds.right_in - white_in_end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3579
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3580 if (!use_overflow)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3581 avail_out = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3582 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3583 avail_out = dl->bounds.right_out - white_out_end;
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 marker = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3586 while (!done && marker < Dynarr_length (ib))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3587 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3588 int width = Dynarr_atp (ib, marker)->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3589
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3590 /* 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
3591 space, we're done. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3592 if (used_in <= avail_in)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3593 done = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3594 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3595 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3596 /* 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
3597 outside. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3598 if (used_out + width <= avail_out)
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 used_out += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3601 used_in -= width;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3604 done = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3605 }
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 if (!done)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3608 marker++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3609 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3610
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3611 /* 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
3612 the inside margin and everything before it goes in the outside
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3613 margin. The stuff going into the outside margin is guaranteed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3614 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
3615
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3616 in_in_start = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3617 in_out_end = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3618 in_out_cnt = in_in_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3619
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3620 Dynarr_free (ib);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3621 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3622 while (elt < Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3623 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3624 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
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 (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3627 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3628
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3629 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3630 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3631 int width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3632
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3633 if (used_out)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3634 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3635 in_out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3636 in_out_end += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3637 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3638 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3639 used_out -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3640 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3641 else if (in_in_start - width >= white_in_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3642 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3643 in_in_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3644 in_in_start -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3645 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3646 gb->active = 1;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3649 gb->active = 0;
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 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3653 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3654 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3655
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3656 /* Determine how many outside margin glyphs we can display. They
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3657 always start at the right outside margin and can only use the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3658 outside margin space. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3659 out_start = dl->bounds.right_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3660 out_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3661 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3662
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3663 while (elt < Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3664 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3665 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
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 (NILP (gb->extent))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
3668 ABORT (); /* these should have been handled in add_glyph_rune */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3669
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3670 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3671 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3672 int width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3673
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3674 if (out_start - width >= in_out_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3675 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3676 out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3677 out_start -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3678 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3679 gb->active = 1;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3682 gb->active = 0;
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 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3686 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3687
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3688 /* 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
3689 to the appropriate display blocks. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3690 if (out_cnt || in_out_cnt || white_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3691 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3692 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3693 /* #### 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
3694 create_left_glyph_block */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3695 odb->start_pos = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3696 odb->end_pos = dl->bounds.right_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3697 Dynarr_reset (odb->runes);
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3700 odb = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3701
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3702 if (in_in_cnt || white_in_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3703 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3704 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3705 idb->start_pos = dl->bounds.right_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3706 /* #### 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
3707 create_left_glyph_block */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3708 idb->end_pos = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3709 Dynarr_reset (idb->runes);
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3712 idb = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3713
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3714 /* First add the whitespace margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3715 inside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3716 if (white_in_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3717 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3718 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3719 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3720 window);
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3723 end_xpos = dl->bounds.right_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3724
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3725 /* Make sure that the area between the end of the whitespace glyphs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3726 and the inside margin glyphs is cleared. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3727 if (in_in_cnt && (in_in_start - end_xpos))
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 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
3730 RIGHT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3731 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3732
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3733 /* Next add the inside margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3734 inside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3735 if (in_in_cnt)
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 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
3738 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3739 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3740
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3741 /* 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
3742 of the inside margin area gets cleared. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3743 if (idb && (dl->bounds.right_in - end_xpos))
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 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
3746 RIGHT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3747 }
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 /* Next add any whitespace glyphs in the outside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3750 if (white_out_cnt)
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 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
3753 GL_WHITESPACE, RIGHT_GLYPHS, window);
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3756 end_xpos = dl->bounds.right_in;
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 /* Next add any inside margin glyphs in the outside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3759 if (in_out_cnt)
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 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3762 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3763 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3764
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3765 /* There may be space between any whitespace or inside margin glyphs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3766 in the outside margin and the actual outside margin glyphs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3767 if (odb && (out_start - end_xpos))
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 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3770 RIGHT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3771 }
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 /* Finally, add the outside margin glyphs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3774 if (out_cnt)
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 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3777 RIGHT_GLYPHS, window);
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
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 /* modeline routines */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3785 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3786 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3787
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3788 /* 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
3789 void
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3790 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
3791 struct window *w, struct display_line *dl,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3792 struct display_block *db, face_index findex,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3793 int min_pixpos, int max_pixpos, int type)
438
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 struct frame *f = XFRAME (w->frame);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3796 struct device *d = XDEVICE (f->device);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3797
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3798 pos_data data;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3799 int c_pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3800 Charcount offset = 0;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3801
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3802 xzero (data);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3803 data.d = d;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3804 data.db = db;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3805 data.dl = dl;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3806 data.findex = findex;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3807 data.pixpos = min_pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3808 data.max_pixpos = max_pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3809 data.cursor_type = NO_CURSOR;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3810 data.last_charset = Qunbound;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3811 data.last_findex = DEFAULT_INDEX;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3812 data.result_str = result_str;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3813 data.is_modeline = 1;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3814 data.string = Qnil;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3815 data.window = wrap_window (w);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3816
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3817 Dynarr_reset (formatted_string_extent_dynarr);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3818 Dynarr_reset (formatted_string_extent_start_dynarr);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3819 Dynarr_reset (formatted_string_extent_end_dynarr);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3820
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3821 /* 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
3822 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
3823 horizontal scrolling amount */
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3824 if (! NILP (result_str))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3825 offset = w->modeline_hscroll;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3826 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
3827 max_pixpos - min_pixpos, findex, type, &offset,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3828 Qnil);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3829
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3830 if (Dynarr_length (db->runes))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3831 {
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
3832 struct rune *rb = Dynarr_lastp (db->runes);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3833 c_pixpos = rb->xpos + rb->width;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3834 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3835 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3836 c_pixpos = min_pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3837
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3838 /* 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
3839 to make up the difference. This usually only occurs if the
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3840 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
3841 font of a different size from the default face font. */
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 if (c_pixpos < max_pixpos)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3844 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3845 data.pixpos = c_pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3846 data.blank_width = max_pixpos - data.pixpos;
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 add_blank_rune (&data, NULL, 0);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3849 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3850
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3851 /* Now create the result string and frob the extents into it. */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3852 if (!NILP (result_str))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3853 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3854 int elt;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3855 Bytecount len;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
3856 Ibyte *strdata;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3857 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3858
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3859 in_modeline_generation = 1;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3860
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
3861 sledgehammer_check_ascii_begin (result_str);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3862 detach_all_extents (result_str);
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3863 resize_string (result_str, -1,
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3864 data.bytepos - XSTRING_LENGTH (result_str));
438
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 strdata = XSTRING_DATA (result_str);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3867
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3868 for (elt = 0, len = 0; elt < Dynarr_length (db->runes); elt++)
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
3869 {
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
3870 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
3871 {
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
3872 len += (set_itext_ichar
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
3873 (strdata + len, Dynarr_atp (db->runes,
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
3874 elt)->object.chr.ch));
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
3875 }
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
3876 }
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3877
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
3878 init_string_ascii_begin (result_str);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
3879 bump_string_modiff (result_str);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
3880 sledgehammer_check_ascii_begin (result_str);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
3881
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3882 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
3883 elt++)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3884 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3885 Lisp_Object extent = Qnil;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3886 Lisp_Object child;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3887
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3888 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
3889 child = Fgethash (extent, buf->modeline_extent_table, Qnil);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3890 if (NILP (child))
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3891 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3892 child = Fmake_extent (Qnil, Qnil, result_str);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3893 Fputhash (extent, child, buf->modeline_extent_table);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3894 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3895 Fset_extent_parent (child, extent);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3896 set_extent_endpoints
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3897 (XEXTENT (child),
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3898 Dynarr_at (formatted_string_extent_start_dynarr, elt),
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3899 Dynarr_at (formatted_string_extent_end_dynarr, elt),
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3900 result_str);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
3901 }
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3902
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3903 in_modeline_generation = 0;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3904 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3905 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3906
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3907 /* Ensure that the given display line DL accurately represents the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3908 modeline for the given window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3909 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3910 generate_modeline (struct window *w, struct display_line *dl, int type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3911 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3912 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3913 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3914 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3915
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3916 /* Unlike display line and rune pointers, this one can't change underneath
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3917 our feet. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3918 struct display_block *db = get_display_block_from_line (dl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3919 int max_pixpos, min_pixpos, ypos_adj;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3920 Lisp_Object font_inst;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3921
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3922 /* This will actually determine incorrect inside boundaries for the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3923 modeline since it ignores the margins. However being aware of this fact
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3924 we never use those values anywhere so it doesn't matter. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3925 dl->bounds = calculate_display_line_boundaries (w, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3926
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3927 /* We are generating a modeline. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3928 dl->modeline = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3929 dl->cursor_elt = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3930
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3931 /* Reset the runes on the modeline. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3932 Dynarr_reset (db->runes);
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 if (!WINDOW_HAS_MODELINE_P (w))
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 struct rune rb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3937
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3938 /* If there is a horizontal scrollbar, don't add anything. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3939 if (window_scrollbar_height (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3940 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3941
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3942 dl->ascent = DEVMETH (d, divider_height, ());
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3943 dl->descent = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3944 /* The modeline is at the bottom of the gutters. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3945 dl->ypos = WINDOW_BOTTOM (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3946
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3947 rb.findex = MODELINE_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3948 rb.xpos = dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3949 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
3950 rb.charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3951 rb.endpos = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3952 rb.type = RUNE_HLINE;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3953 rb.object.hline.thickness = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3954 rb.object.hline.yoffset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3955 rb.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3956
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3957 if (!EQ (Qzero, w->modeline_shadow_thickness)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3958 && FRAME_WIN_P (f))
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 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3961
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3962 dl->ypos -= shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3963 rb.xpos += shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3964 rb.width -= 2 * shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3965 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3966
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3967 Dynarr_add (db->runes, rb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3968 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3969 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3970
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3971 /* !!#### not right; needs to compute the max height of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3972 all the charsets */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3973 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3974
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3975 dl->ascent = XFONT_INSTANCE (font_inst)->ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3976 dl->descent = XFONT_INSTANCE (font_inst)->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3977
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3978 min_pixpos = dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3979 max_pixpos = dl->bounds.right_out;
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 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f))
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 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3984
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3985 ypos_adj = shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3986 min_pixpos += shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3987 max_pixpos -= shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3988 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3989 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3990 ypos_adj = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3991
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3992 generate_formatted_string_db (b->modeline_format,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3993 b->generated_modeline_string, w, dl, db,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3994 MODELINE_INDEX, min_pixpos, max_pixpos, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3995
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3996 /* 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
3997 set this until we've generated the modeline in order to account
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3998 for any embedded faces. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3999 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4000 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4001
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4002 static Charcount
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4003 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
4004 Charcount pos, Charcount min_pos,
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4005 Charcount max_pos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4006 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4007 /* This function has been Mule-ized. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4008 Charcount end;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4009 const Ibyte *cur_pos = str;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4010 struct display_block *db = data->db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4011
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4012 data->blank_width = space_width (XWINDOW (data->window));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4013 while (Dynarr_length (db->runes) < pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4014 add_blank_rune (data, NULL, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4015
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4016 end = (Dynarr_length (db->runes) +
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4017 bytecount_to_charcount (str, strlen ((const char *) str)));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4018 if (max_pos != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4019 end = min (max_pos, end);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4020
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4021 while (pos < end && *cur_pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4022 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4023 const Ibyte *old_cur_pos = cur_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4024 int succeeded;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4025
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4026 data->ch = itext_ichar (cur_pos);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4027 succeeded = (add_ichar_rune (data) != ADD_FAILED);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4028 INC_IBYTEPTR (cur_pos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4029 if (succeeded)
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4030 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4031 pos++;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4032 data->modeline_charpos++;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4033 data->bytepos += cur_pos - old_cur_pos;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4034 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4035 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4036
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4037 while (Dynarr_length (db->runes) < min_pos &&
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4038 (data->pixpos + data->blank_width <= data->max_pixpos))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4039 add_blank_rune (data, NULL, 0);
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 return Dynarr_length (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4042 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4043
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4044 /* #### Urk! Should also handle begin-glyphs and end-glyphs in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4045 modeline extents. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4046 static Charcount
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4047 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
4048 Charcount pos, Charcount UNUSED (min_pos),
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4049 Charcount max_pos, Lisp_Object extent)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4050 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4051 /* This function has been Mule-ized. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4052 Charcount end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4053 struct display_block *db = data->db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4054 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4055
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4056 data->blank_width = space_width (XWINDOW (data->window));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4057 while (Dynarr_length (db->runes) < pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4058 add_blank_rune (data, NULL, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4059
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4060 end = Dynarr_length (db->runes) + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4061 if (max_pos != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4062 end = min (max_pos, end);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4063
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4064 gb.glyph = glyph;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4065 gb.extent = extent;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4066 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4067 pos++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4068
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4069 while (Dynarr_length (db->runes) < pos &&
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4070 (data->pixpos + data->blank_width <= data->max_pixpos))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4071 add_blank_rune (data, NULL, 0);
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 return Dynarr_length (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4074 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4075
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4076 /* 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
4077 true of max_pixsize. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4078 #define SET_CURRENT_MODE_CHARS_PIXSIZE \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4079 if (Dynarr_length (data->db->runes)) \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4080 cur_pixsize = data->pixpos - Dynarr_atp (data->db->runes, 0)->xpos; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4081 else \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4082 cur_pixsize = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4083
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4084 /* Note that this function does "positions" in terms of characters and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4085 not in terms of columns. This is necessary to make the formatting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4086 work correctly when proportional width fonts are used in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4087 modeline. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4088 static Charcount
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4089 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
4090 Charcount min_pos, Charcount max_pos,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4091 Lisp_Object elt, int depth, int max_pixsize,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4092 face_index findex, int type, Charcount *offset,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4093 Lisp_Object cur_ext)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4094 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4095 /* This function has been Mule-ized. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4096 /* #### The other losing things in this function are:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4097
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4098 -- C zero-terminated-string lossage.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4099 -- 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
4100 appropriate (e.g. ^F) instead of blindly being printed anyway.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4101 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4102
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4103 tail_recurse:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4104 if (depth > 10)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4105 goto invalid;
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 depth++;
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 if (STRINGP (elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4110 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4111 /* 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
4112 within it. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4113
2552
166ed8151e62 [xemacs-hg @ 2005-02-03 16:30:33 by james]
james
parents: 2551
diff changeset
4114 Ibyte *this_str = XSTRING_DATA (elt);
166ed8151e62 [xemacs-hg @ 2005-02-03 16:30:33 by james]
james
parents: 2551
diff changeset
4115
166ed8151e62 [xemacs-hg @ 2005-02-03 16:30:33 by james]
james
parents: 2551
diff changeset
4116 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
4117 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4118 Ibyte *last = this_str;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4119
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4120 while (*this_str && *this_str != '%')
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4121 this_str++;
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 if (this_str != last)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4124 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4125 /* No %-construct */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4126 Charcount size =
2552
166ed8151e62 [xemacs-hg @ 2005-02-03 16:30:33 by james]
james
parents: 2551
diff changeset
4127 bytecount_to_charcount (last, this_str - last);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4128
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4129 if (size <= *offset)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4130 *offset -= size;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4131 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4132 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4133 Charcount tmp_max = (max_pos == -1 ? pos + size - *offset :
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4134 min (pos + size - *offset, max_pos));
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4135 const Ibyte *tmp_last = itext_n_addr (last, *offset);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4136
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4137 pos = add_string_to_fstring_db_runes (data, tmp_last,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4138 pos, pos, tmp_max);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4139 *offset = 0;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4140 }
4187
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 else /* *this_str == '%' */
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 Charcount spec_width = 0;
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 this_str++; /* skip over '%' */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4147
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4148 /* 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
4149 * Argument specifies minwidth but not maxwidth
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4150 * (maxwidth can be specified by
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4151 * (<negative-number> . <stuff>) modeline elements)
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 while (isdigit (*this_str))
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4154 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4155 spec_width = spec_width * 10 + (*this_str - '0');
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4156 this_str++;
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 spec_width += pos;
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 if (*this_str == 'M')
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4161 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4162 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
4163 max_pos, Vglobal_mode_string,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4164 depth, max_pixsize, findex,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4165 type, offset, cur_ext);
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 else if (*this_str == '-')
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 Charcount num_to_add;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4170
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4171 if (max_pixsize < 0)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4172 num_to_add = 0;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4173 else if (max_pos != -1)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4174 num_to_add = max_pos - pos;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4175 else
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4176 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4177 int cur_pixsize;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4178 int dash_pixsize;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4179 Ibyte ch = '-';
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4180 SET_CURRENT_MODE_CHARS_PIXSIZE;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4181
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4182 dash_pixsize =
4815
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
4183 redisplay_window_text_width_string
6540302eedf5 Fix query_string_geometry lookup domain
Didier Verna <didier@lrde.epita.fr>
parents: 4528
diff changeset
4184 (w, findex, &ch, Qnil, 0, 1);
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4185
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4186 if (dash_pixsize == 0)
3094
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 3025
diff changeset
4187 num_to_add = 0;
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 3025
diff changeset
4188 else {
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 3025
diff changeset
4189 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
4190 num_to_add++;
ad2f4ae9895b [xemacs-hg @ 2005-11-26 11:45:47 by stephent]
stephent
parents: 3025
diff changeset
4191 }
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4192 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4193
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4194 while (num_to_add--)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4195 pos = add_string_to_fstring_db_runes
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4196 (data, (const Ibyte *) "-", pos, pos, max_pos);
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 else if (*this_str != 0)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4199 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4200 Ichar ch = itext_ichar (this_str);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4201 Ibyte *str;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4202 Charcount size;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4203
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4204 decode_mode_spec (w, ch, type);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4205
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4206 str = Dynarr_atp (mode_spec_ibyte_string, 0);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4207 size = bytecount_to_charcount
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4208 /* 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
4209 (str, Dynarr_length (mode_spec_ibyte_string)) - 1;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4210
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4211 if (size <= *offset)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4212 *offset -= size;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4213 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4214 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4215 const Ibyte *tmp_str = itext_n_addr (str, *offset);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4216
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
4217 /* #### 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
4218 computed and used here as in the plain string case
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4219 above. -- dv */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4220 pos = add_string_to_fstring_db_runes (data, tmp_str,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4221 pos, pos,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4222 max_pos);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4223 *offset = 0;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4224 }
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4225 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4226
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4227 /* 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
4228 the current position. */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4229 INC_IBYTEPTR (this_str);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4230 }
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 if (max_pixsize > 0)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4233 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4234 int cur_pixsize;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4235 SET_CURRENT_MODE_CHARS_PIXSIZE;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4236
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4237 if (cur_pixsize >= max_pixsize)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4238 break;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4239 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4240 }
428
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 else if (SYMBOLP (elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4243 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4244 /* 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
4245 as if it appeared here directly. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4246 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4247
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4248 if (!UNBOUNDP (tem))
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4249 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4250 /* 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
4251 don't check for % within it. */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4252 if (STRINGP (tem))
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4253 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4254 Ibyte *str = XSTRING_DATA (tem);
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4255 Charcount size = string_char_length (tem);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4256
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4257 if (size <= *offset)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4258 *offset -= size;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4259 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4260 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4261 const Ibyte *tmp_str = itext_n_addr (str, *offset);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4262
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
4263 /* #### 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
4264 computed and used here as in the plain string case
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4265 above. -- dv */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4266 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4267 min_pos, max_pos);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4268 *offset = 0;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4269 }
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4270 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4271 /* Give up right away for nil or t. */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4272 else if (!EQ (tem, elt))
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4273 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4274 elt = tem;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4275 goto tail_recurse;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4276 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4277 }
428
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 else if (GENERIC_SPECIFIERP (elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4280 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4281 Lisp_Object window, tem;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
4282 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4283 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
4284 ERROR_ME_DEBUG_WARN, 0, Qzero);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4285 if (!UNBOUNDP (tem))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4286 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4287 elt = tem;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4288 goto tail_recurse;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4289 }
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 else if (CONSP (elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4292 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4293 /* A cons cell: four distinct cases.
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4294 * - 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
4295 * and effectively concatenate them.
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4296 * - If first element is a negative number, truncate displaying cdr to
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4297 * at most that many characters. If positive, pad (with spaces)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4298 * to at least that many characters.
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4299 * - 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
4300 * 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
4301 * 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
4302 * - 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
4303 * 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
4304 * the modeline's window is non-nil or nil.
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4305 * - If first element is an extent, process the cdr recursively
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4306 * and handle the extent's face.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4307 */
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4308
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4309 Lisp_Object car, tem;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4310
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4311 car = XCAR (elt);
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4312 if (SYMBOLP (car) || BOOLEAN_SPECIFIERP (car))
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4313 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4314 elt = XCDR (elt);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4315 if (!CONSP (elt))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4316 goto invalid;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4317
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4318 if (SYMBOLP (car))
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4319 tem = symbol_value_in_buffer (car, w->buffer);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4320 else
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4321 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
4322 ERROR_ME_DEBUG_WARN, 0, Qzero);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4323 /* 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
4324 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
4325 if (!UNBOUNDP (tem) && !NILP (tem))
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4326 {
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4327 elt = XCAR (elt);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4328 goto tail_recurse;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4329 }
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4330 /* 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
4331 * Get the cddr of the original list
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4332 * and if possible find the caddr and use that.
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4333 */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4334 elt = XCDR (elt);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4335 if (NILP (elt))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4336 ;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4337 else if (!CONSP (elt))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4338 goto invalid;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4339 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4340 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4341 elt = XCAR (elt);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4342 goto tail_recurse;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4343 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4344 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4345 else if (INTP (car))
4187
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 Charcount lim = XINT (car);
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 elt = XCDR (elt);
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 if (lim < 0)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4352 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4353 /* Negative int means reduce maximum width.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4354 * DO NOT change MIN_PIXPOS here!
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4355 * (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
4356 * and then pad to 20.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4357 */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4358 if (max_pos == -1)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4359 max_pos = pos - lim;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4360 else
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4361 max_pos = min (max_pos, pos - lim);
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 else if (lim > 0)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4364 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4365 /* 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
4366 * current maximum.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4367 */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4368 lim += pos;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4369 if (max_pos != -1 && lim > max_pos)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4370 lim = max_pos;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4371 /* 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
4372 * 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
4373 * that is beyond the current truncation point.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4374 */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4375 if (lim > min_pos)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4376 min_pos = lim;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4377 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4378 goto tail_recurse;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4379 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4380 else if (STRINGP (car) || CONSP (car))
4187
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 int limit = 50;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4383
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4384 /* LIMIT is to protect against circular lists. */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4385 while (CONSP (elt) && --limit > 0
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4386 && (pos < max_pos || max_pos == -1))
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4387 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4388 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
4389 XCAR (elt), depth, max_pixsize,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4390 findex, type, offset, cur_ext);
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4391 elt = XCDR (elt);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4392 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4393 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4394 else if (EXTENTP (car))
4187
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 struct extent *ext = XEXTENT (car);
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 if (EXTENT_LIVE_P (ext))
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4399 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4400 face_index old_findex = data->findex;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4401 Lisp_Object face;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4402 Lisp_Object font_inst;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4403 face_index new_findex;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4404 Bytecount start = data->bytepos;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4405
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4406 face = extent_face (ext);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4407 if (FACEP (face))
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4408 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4409 /* #### needs to merge faces, sigh */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4410 /* #### needs to handle list of faces */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4411 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
4412 /* !!#### 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
4413 all the charsets */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4414 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
4415 Vcharset_ascii);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4416
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4417 data->dl->ascent = max (data->dl->ascent,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4418 XFONT_INSTANCE (font_inst)->ascent);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4419 data->dl->descent = max (data->dl->descent,
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4420 XFONT_INSTANCE (font_inst)->
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4421 descent);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4422 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4423 else
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4424 new_findex = old_findex;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4425
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4426 data->findex = new_findex;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4427 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
4428 XCDR (elt), depth - 1,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4429 max_pixsize, new_findex, type,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4430 offset, car);
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4431 data->findex = old_findex;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4432 Dynarr_add (formatted_string_extent_dynarr, ext);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4433 Dynarr_add (formatted_string_extent_start_dynarr, start);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4434 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
4435 }
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4436 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4437 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4438 else if (GLYPHP (elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4439 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4440 /* Glyphs are considered as one character with respect to the modeline
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4441 horizontal scrolling facility. -- dv */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4442 if (*offset > 0)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4443 *offset -= 1;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4444 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4445 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
4446 cur_ext);
428
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4449 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4450 invalid:
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4451 {
4528
726060ee587c First draft of g++ 4.3 warning removal patch. Builds. *Needs ChangeLogs.*
Stephen J. Turnbull <stephen@xemacs.org>
parents: 4522
diff changeset
4452 const char *str = GETTEXT ("*invalid*");
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4453 Charcount size = (Charcount) strlen (str); /* is this ok ?? -- dv */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4454
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4455 if (size <= *offset)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4456 *offset -= size;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4457 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4458 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4459 const Ibyte *tmp_str =
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4460 itext_n_addr ((const Ibyte *) str, *offset);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4461
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
4462 /* #### 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
4463 used here as in the plain string case above. -- dv */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4464 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4465 min_pos, max_pos);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4466 *offset = 0;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4467 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4468 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4469 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4470
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4471 if (min_pos > pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4472 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4473 add_string_to_fstring_db_runes (data, (const Ibyte *) "", pos,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4474 min_pos, -1);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4475 }
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 return pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4478 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4479
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4480 /* Update just the modeline. Assumes the desired display structs. If
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4481 they do not have a modeline block, it does nothing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4482 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4483 regenerate_modeline (struct window *w)
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 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4486
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4487 if (!Dynarr_length (dla) || !Dynarr_atp (dla, 0)->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4488 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4489 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4490 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4491 generate_modeline (w, Dynarr_atp (dla, 0), DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4492 redisplay_update_line (w, 0, 0, 0);
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4495
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4496 /* Make sure that modeline display line is present in the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4497 display structs if the window has a modeline and update that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4498 line. Returns true if a modeline was needed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4499 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4500 ensure_modeline_generated (struct window *w, int type)
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 int need_modeline;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4503
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4504 /* minibuffer windows don't have modelines */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4505 if (MINI_WINDOW_P (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4506 need_modeline = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4507 /* windows which haven't had it turned off do */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4508 else if (WINDOW_HAS_MODELINE_P (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4509 need_modeline = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4510 /* 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
4511 a horizontal scrollbar */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4512 else if (window_scrollbar_height (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4513 need_modeline = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4514 /* and in this case there is none */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4515 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4516 need_modeline = 1;
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 if (need_modeline)
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 display_line_dynarr *dla;
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 dla = window_display_lines (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4523
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4524 /* 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
4525 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
4526 one if we have gotten to this point. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4527 if (Dynarr_length (dla) == 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4528 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4529 if (Dynarr_largest (dla) > 0)
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
4530 Dynarr_increment (dla);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4531 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4532 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4533 struct display_line modeline;
4207
62d532188a28 [xemacs-hg @ 2007-10-03 10:06:39 by didierv]
didierv
parents: 4187
diff changeset
4534
62d532188a28 [xemacs-hg @ 2007-10-03 10:06:39 by didierv]
didierv
parents: 4187
diff changeset
4535 DISPLAY_LINE_INIT (modeline);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4536 Dynarr_add (dla, modeline);
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4539
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4540 /* 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
4541 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
4542 window_modeline_height. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4543 generate_modeline (w, Dynarr_atp (dla, 0), type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4544 }
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 return need_modeline;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4547 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4548
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4549 /* #### Kludge or not a kludge. I tend towards the former. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4550 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4551 real_current_modeline_height (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4552 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4553 Fset_marker (w->start[CMOTION_DISP], w->start[CURRENT_DISP], w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4554 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer);
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 if (ensure_modeline_generated (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 display_line_dynarr *dla = window_display_lines (w, CMOTION_DISP);
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_length (dla))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4561 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4562 if (Dynarr_atp (dla, 0)->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4563 return (Dynarr_atp (dla, 0)->ascent +
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4564 Dynarr_atp (dla, 0)->descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4565 }
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 return 0;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4570
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4571 /***************************************************************************/
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4572 /* */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4573 /* displayable string routines */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4574 /* */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4575 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4576
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4577 /* 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
4578 display line DL accurately represents the text on a line starting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4579 at the given position.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4580
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4581 Yes, this is duplicating the code of create_text_block, but it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4582 looked just too hard to change create_text_block to handle strings
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4583 *and* buffers. We already make a distinction between the two
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4584 elsewhere in the code so I think unifying them would require a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4585 complete MULE rewrite. Besides, the other distinction is that these
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4586 functions cover text that the user *cannot edit* so we can remove
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4587 everything to do with cursors, minibuffers etc. Eventually the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4588 modeline routines should be modified to use this code as it copes
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4589 with many more types of display situation. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4590
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
4591 static Charbpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4592 create_string_text_block (struct window *w, Lisp_Object disp_string,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4593 struct display_line *dl,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4594 Charcount start_pos,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4595 prop_block_dynarr **prop,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4596 face_index default_face)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4597 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4598 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4599 /* 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
4600 because you might well want to make use of it (selective display
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4601 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
4602 seems to be possible for buffer to be nil sometimes so protect
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4603 against this case. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4604 struct buffer *b = BUFFERP (w->buffer) ? XBUFFER (w->buffer) : 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4605 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4606
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4607 /* we're working with these a lot so precalculate them */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4608 Bytecount slen = XSTRING_LENGTH (disp_string);
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4609 Bytecount byte_string_zv = slen;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4610 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
4611
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4612 pos_data data;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4613
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4614 int truncate_win = b ? window_truncation_on (w) : 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4615
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4616 /* 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
4617 FSF thing and invisible extents are the way to go here.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4618 Implementing it also relies on a number of buffer-specific
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4619 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
4620 here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4621
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4622 /* The variable ctl-arrow allows the user to specify what characters
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4623 can actually be displayed and which octal should be used for.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4624 #### This variable should probably have some rethought done to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4625 it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4626
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4627 #### It would also be really nice if you could specify that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4628 the characters come out in hex instead of in octal. Mule
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4629 does that by adding a ctl-hexa variable similar to ctl-arrow,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4630 but that's bogus -- we need a more general solution. I
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4631 think you need to extend the concept of display tables
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4632 into a more general conversion mechanism. Ideally you
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4633 could specify a Lisp function that converts characters,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4634 but this violates the Second Golden Rule and besides would
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4635 make things way way way way slow.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4636
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4637 So instead, we extend the display-table concept, which was
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4638 historically limited to 256-byte vectors, to one of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4639 following:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4640
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4641 a) A 256-entry vector, for backward compatibility;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4642 b) char-table, mapping characters to values;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4643 c) range-table, mapping ranges of characters to values;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4644 d) a list of the above.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4645
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4646 The (d) option allows you to specify multiple display tables
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4647 instead of just one. Each display table can specify conversions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4648 for some characters and leave others unchanged. The way the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4649 character gets displayed is determined by the first display table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4650 with a binding for that character. This way, you could call a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4651 function `enable-hex-display' that adds a hex display-table to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4652 the list of display tables for the current buffer.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4653
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4654 #### ...not yet implemented... Also, we extend the concept of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4655 "mapping" to include a printf-like spec. Thus you can make all
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4656 extended characters show up as hex with a display table like
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4657 this:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4658
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4659 #s(range-table data ((256 524288) (format "%x")))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4660
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4661 Since more than one display table is possible, you have
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4662 great flexibility in mapping ranges of characters. */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4663 Ichar printable_min = b ? (CHAR_OR_CHAR_INTP (b->ctl_arrow)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4664 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4665 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4666 ? 255 : 160)) : 255;
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 Lisp_Object face_dt, window_dt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4669
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4670 /* The text display block for this display line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4671 struct display_block *db = get_display_block_from_line (dl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4672
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4673 /* 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
4674 data to be updated. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4675 int initial = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4676
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4677 /* Apparently the new extent_fragment_update returns an end position
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4678 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
4679 displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4680 int no_more_frags = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4681
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4682 dl->used_prop_data = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4683 dl->num_chars = 0;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4684 dl->line_continuation = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4685
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4686 /* 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
4687 dl->default_findex = default_face;
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4688 if (default_face > DEFAULT_INDEX)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4689 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4690 dl->left_margin_findex = default_face;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4691 dl->right_margin_findex = default_face;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4692 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4693 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4694 {
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
4695 dl->left_margin_findex =
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4696 get_builtin_face_cache_index (w, Vleft_margin_face);
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
4697 dl->right_margin_findex =
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4698 get_builtin_face_cache_index (w, Vright_margin_face);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4699 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4700
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4701 xzero (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4702 data.ef = extent_fragment_new (disp_string, f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4703
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4704 /* 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
4705 them to this structure for ease of passing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4706 data.d = d;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
4707 data.window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4708 data.db = db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4709 data.dl = dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4710
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4711 data.byte_charpos = byte_start_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4712 data.pixpos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4713 data.last_charset = Qunbound;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4714 data.last_findex = default_face;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4715 data.result_str = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4716 data.string = disp_string;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4717
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4718 /* Set the right boundary adjusting it to take into account any end
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4719 glyph. Save the width of the end glyph for later use. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4720 data.max_pixpos = dl->bounds.right_in;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4721 data.max_pixpos -= data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4722
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4723 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4724 data.cursor_x = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4725
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4726 data.start_col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4727 /* 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
4728 the window
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4729 data.start_col = w->hscroll;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4730 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4731 */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4732 data.byte_start_col_enabled = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4733 data.hscroll_glyph_width_adjust = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4734
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4735 /* We regenerate the line from the very beginning. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4736 Dynarr_reset (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4737
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4738 /* 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
4739 starting position is already equal to the maximum we can't add
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4740 anything else, right? Wrong. We might still have a newline to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4741 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
4742 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
4743 glyph. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4744
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4745 /* #### Chuck -- I think this condition should be while (1).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4746 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
4747 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
4748 end-glyph and text might not be displayed. while (1) ensures
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4749 that the loop terminates only when either (a) there is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4750 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
4751
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4752 #### Also I think you need to ensure that the operation
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4753 "add begin glyphs; add end glyphs; add text" is atomic and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4754 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
4755 of the line during that operation, then you keep accumulating
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4756 propagation data until you're done. Otherwise, if the (e.g.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4757 there's a begin glyph at a particular position and attempting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4758 to display that glyph results in window-end being hit and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4759 propagation data being generated, then the character at that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4760 position won't be displayed.
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 #### See also the comment after the end of this loop, below.
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 while (data.pixpos <= data.max_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4765 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4766 /* #### This check probably should not be necessary. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4767 if (data.byte_charpos > byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4768 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4769 /* #### urk! More of this lossage! */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4770 data.byte_charpos--;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4771 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4772 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4773
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4774 /* Check for face changes. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4775 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4776 {
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4777 Lisp_Object last_glyph = Qnil;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4778 /* 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
4779 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
4780 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4781 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
4782 Dynarr_free (*prop);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4783 *prop = 0;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4784 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4785 /* Now compute the face and begin/end-glyph information. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4786 data.findex =
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
4787 /* 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
4788 Bytexpos's. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4789 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4790 /* 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
4791 propagate default_face into extent_fragment_update. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4792 if (data.findex == DEFAULT_INDEX)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4793 data.findex = default_face;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4794
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4795 get_display_tables (w, data.findex, &face_dt, &window_dt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4796
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4797 if (data.byte_charpos == data.ef->end)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4798 no_more_frags = 1;
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 initial = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4801
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4802 /* 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
4803 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
4804 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
4805 current buffer position. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4806
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4807 /* 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
4808 nothing (except maybe add some ellipses).
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4809
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4810 #### The behavior of begin and end-glyphs at the edge of an
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4811 invisible extent should be investigated further. This is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4812 fairly low priority though. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4813 if (data.ef->invisible)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4814 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4815 /* #### Chuck, perhaps you could look at this code? I don't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4816 really know what I'm doing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4817 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4818 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4819 Dynarr_free (*prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4820 *prop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4821 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4822
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4823 /* The extent fragment code only sets this when we should
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4824 really display the ellipses. It makes sure the ellipses
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4825 don't get displayed more than once in a row. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4826 if (data.ef->invisible_ellipses)
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 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4829
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4830 data.ef->invisible_ellipses_already_displayed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4831 data.ef->invisible_ellipses = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4832 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4833 gb.glyph = Vinvisible_text_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4834 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4835 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4836 /* Perhaps they shouldn't propagate if the very next thing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4837 is to display a newline (for compatibility with
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4838 selective-display-ellipses)? Maybe that's too
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4839 abstruse. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4840 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4841 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4842 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4843
638
373ced43e288 [xemacs-hg @ 2001-07-26 21:10:44 by adrian]
adrian
parents: 617
diff changeset
4844 /* #### What if we're dealing with a display table? */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4845 if (data.start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4846 data.start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4847
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4848 if (data.byte_charpos == byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4849 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4850 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4851 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4852 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4853
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4854 /* 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
4855 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
4856 position counter. This might also add the minibuffer
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
4857 prompt. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4858 else if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4859 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4860 dl->used_prop_data = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4861 *prop = add_propagation_runes (prop, &data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4862
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4863 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4864 goto done; /* gee, a really narrow window */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4865 else if (data.byte_charpos == byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4866 goto done;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4867 else if (data.byte_charpos < 0)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4868 /* #### 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
4869 data.byte_charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4870 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4871 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4872 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4873
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4874 /* If there are end glyphs, add them to the line. These are
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4875 the end glyphs for the previous run of text. We add them
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4876 here rather than doing them at the end of handling the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4877 previous run so that glyphs at the beginning and end of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4878 a line are handled correctly. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4879 else if (Dynarr_length (data.ef->end_glyphs) > 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4880 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4881 data.ch = string_ichar (disp_string, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4882 *prop = add_glyph_runes (&data, END_GLYPHS);
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4883
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4884 if (*prop) {
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4885 goto done;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4886 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4887 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4888
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4889 /* If there are begin glyphs, add them to the line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4890 else if (Dynarr_length (data.ef->begin_glyphs) > 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4891 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4892 data.ch = string_ichar (disp_string, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4893 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4894
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4895 if (*prop) {
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4896 goto done;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4897 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4898 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4899
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4900 /* If at end-of-buffer, we've already processed begin and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4901 end-glyphs at this point and there's no text to process,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4902 so we're done. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4903 else if (data.byte_charpos == byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4904 goto done;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4907 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4908 Lisp_Object entry = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4909 /* 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
4910 data.ch = string_ichar (disp_string, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4911 if (!NILP (face_dt) || !NILP (window_dt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4912 entry = display_table_entry (data.ch, face_dt, window_dt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4913
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4914 /* 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
4915 add_disp_table_entry_runes and let it worry about it. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4916 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
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 *prop = add_disp_table_entry_runes (&data, entry);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4919
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4920 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4921 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4922 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4923
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4924 /* 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
4925 to the line and end this loop. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4926 else if (data.ch == '\n')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4927 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4928 /* 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
4929 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
4930 fit. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4931 data.max_pixpos += data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4932 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4933 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4934
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4935 /* 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
4936 just add it. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4937 else if (data.ch >= printable_min)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4938 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4939 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4940 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4941 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4942 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4943
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4944 /* 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
4945 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
4946 current pixel position to that starting position. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4947 else if (data.ch == '\t')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4948 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4949 int tab_start_pixpos = data.pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4950 int next_tab_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4951 int char_tab_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4952 int prop_width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4953
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4954 if (data.start_col > 1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4955 tab_start_pixpos -= (space_width (w) * (data.start_col - 1));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4956
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4957 next_tab_start =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4958 next_tab_position (w, tab_start_pixpos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4959 dl->bounds.left_in +
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4960 data.hscroll_glyph_width_adjust);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4961 if (next_tab_start > data.max_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4962 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4963 prop_width = next_tab_start - data.max_pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4964 next_tab_start = data.max_pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4965 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4966 data.blank_width = next_tab_start - data.pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4967 char_tab_width =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4968 (next_tab_start - tab_start_pixpos) / space_width (w);
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 *prop = add_blank_rune (&data, w, char_tab_width);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4971
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4972 /* 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
4973 sizes guaranteed to fit in the available space. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4974 assert (!(*prop));
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 if (prop_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4977 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4978 struct prop_block pb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4979 *prop = Dynarr_new (prop_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4980
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4981 pb.type = PROP_BLANK;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4982 pb.data.p_blank.width = prop_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4983 pb.data.p_blank.findex = data.findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4984 Dynarr_add (*prop, pb);
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 goto done;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4989
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4990 /* 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
4991 add_control_char_runes.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4992
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4993 The is_*() routines have undefined results on
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4994 arguments outside of the range [-1, 255]. (This
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4995 often bites people who carelessly use `char' instead
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4996 of `unsigned char'.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4997 */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4998 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch))
428
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 *prop = add_control_char_runes (&data, b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5001
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5002 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5003 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5004 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5005
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5006 /* 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
5007 already handled it, then print it as an octal number. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5008 else if (data.ch >= 0200)
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 *prop = add_octal_runes (&data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5011
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5012 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5013 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5014 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5015
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5016 /* 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
5017 then just add it. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5018 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5019 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
5020 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5021 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5022 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5023 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5024
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5025 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5026 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5027 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5028
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5029 done:
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5030
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5031 /* 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
5032 end of the buffer. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5033 if (data.byte_charpos < byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5034 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5035 /* #### This check is not correct. If the line terminated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5036 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
5037 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
5038 you make the two changes mentioned at the top of this loop,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5039 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
5040 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
5041 check. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5042
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5043 /* 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
5044 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
5045 position. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5046 if (data.ch == '\n')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5047 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5048 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5049 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5050
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5051 /* 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
5052 line. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5053 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5054 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5055 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5056 struct glyph_cachel *cachel;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5057
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5058 /* 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
5059 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
5060 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
5061 we starting laying out the line. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5062 data.max_pixpos += data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5063 data.findex = default_face;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5064 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5065
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5066 if (truncate_win)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5067 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5068 Bytecount byte_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5069
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5070 /* 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
5071 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
5072 data.byte_charpos, 1);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5073
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5074 data.cursor_type = NO_CURSOR;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5075 data.byte_charpos = byte_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5076 gb.glyph = Vtruncation_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5077 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5080 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5081 /* The cursor can never be on the continuation glyph. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5082 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5083
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5084 /* 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
5085
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5086 dl->line_continuation = 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5087 gb.glyph = Vcontinuation_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5088 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5089 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5090
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5091 if (data.end_glyph_width)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5092 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5093
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5094 if (truncate_win && data.byte_charpos == byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5095 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
5096 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
5097 byte_string_zv);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
5098 DEC_IBYTEPTR (endb);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
5099 if (itext_ichar (endb) != '\n')
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5100 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5101 /* #### Damn this losing shit. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5102 data.byte_charpos++;
428
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5105 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5106 }
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5107 else if (data.byte_charpos == byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5108 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5109 /* create_text_block () adds a bogus \n marker here which screws
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5110 up subwindow display. Since we never have a cursor in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5111 gutter we can safely ignore it. */
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 /* Calculate left whitespace boundary. */
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 int elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5116
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5117 /* Whitespace past a newline is considered right whitespace. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5118 while (elt < Dynarr_length (db->runes))
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 struct rune *rb = Dynarr_atp (db->runes, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5121
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5122 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5123 || rb->type == RUNE_BLANK)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5124 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5125 dl->bounds.left_white += rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5126 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5127 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5128 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5129 elt = Dynarr_length (db->runes);
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 }
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 /* Calculate right whitespace boundary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5134 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5135 int elt = Dynarr_length (db->runes) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5136 int done = 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 while (!done && elt >= 0)
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 struct rune *rb = Dynarr_atp (db->runes, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5141
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5142 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5143 && isspace (rb->object.chr.ch))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5144 && !rb->type == RUNE_BLANK)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5145 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5146 dl->bounds.right_white = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5147 done = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5148 }
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 elt--;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5153
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5154 /* The line is blank so everything is considered to be right
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5155 whitespace. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5156 if (!done)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5157 dl->bounds.right_white = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5158 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5159
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5160 /* Set the display blocks bounds. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5161 db->start_pos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5162 if (Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5163 {
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
5164 struct rune *rb = Dynarr_lastp (db->runes);
428
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 db->end_pos = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5167 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5168 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5169 db->end_pos = dl->bounds.right_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5170
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5171 calculate_baseline (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5172
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5173 dl->ascent = data.new_ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5174 dl->descent = data.new_descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5175
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 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5178
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5179 if (dl->ascent < ascent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5180 dl->ascent = ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5181 }
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 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5184
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5185 if (dl->descent < descent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5186 dl->descent = descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5187 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5188
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5189 calculate_yoffset (dl, db);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5190
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5191 dl->cursor_elt = data.cursor_x;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5192 /* #### lossage lossage lossage! Fix this shit! */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5193 if (data.byte_charpos > byte_string_zv)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5194 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
5195 byte_string_zv);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5196 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5197 dl->end_charpos =
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5198 buffer_or_string_bytexpos_to_charxpos (disp_string,
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5199 data.byte_charpos) - 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5200 if (truncate_win)
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
5201 data.dl->num_chars =
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5202 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
5203 b ? XINT (b->tab_width) : 8);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5204 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5205 /* This doesn't correctly take into account tabs and control
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5206 characters but if the window isn't being truncated then this
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5207 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
5208 data.dl->num_chars = dl->end_charpos - dl->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5209
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5210 /* #### handle horizontally scrolled line with text none of which
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5211 was actually laid out. */
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 /* #### handle any remainder of overlay arrow */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5214
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5215 if (*prop == ADD_FAILED)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5216 *prop = NULL;
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 if (truncate_win && *prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5219 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5220 Dynarr_free (*prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5221 *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5222 }
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 extent_fragment_delete (data.ef);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5225
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5226 /* #### 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
5227 it so that regenerate_window will exit properly. This is bogus.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5228 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
5229 this function if we are already at EOB. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5230
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5231 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
5232 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
5233 data.byte_charpos) + 1; /* Yuck! */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5234 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5235 return string_index_byte_to_char (disp_string, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5236 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5237
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5238 /* Given a display line and a starting position, ensure that the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5239 contents of the display line accurately represent the visual
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5240 representation of the buffer contents starting from the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5241 position when displayed in the given window. The display line ends
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5242 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
5243 window.
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
5244
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5245 This is very similar to generate_display_line but with the same
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5246 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
5247 of fixing the bytebpos stuff though.*/
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5248
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5249 static Charbpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5250 generate_string_display_line (struct window *w, Lisp_Object disp_string,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5251 struct display_line *dl,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5252 Charcount start_pos,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5253 prop_block_dynarr **prop,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5254 face_index default_face)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5255 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5256 Charcount ret_charcount;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5257
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5258 /* you must set bounds before calling this. */
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
5259
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5260 /* Reset what this line is using. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5261 if (dl->display_blocks)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5262 Dynarr_reset (dl->display_blocks);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5263 if (dl->left_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5264 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5265 Dynarr_free (dl->left_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5266 dl->left_glyphs = 0;
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 if (dl->right_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5269 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5270 Dynarr_free (dl->right_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5271 dl->right_glyphs = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5272 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5273
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5274 /* We aren't generating a modeline at the moment. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5275 dl->modeline = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5276
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5277 /* 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
5278 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
5279 prop, default_face);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5280 dl->charpos = start_pos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5281 if (dl->end_charpos < dl->charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5282 dl->end_charpos = dl->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5283
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5284 /* If there are left glyphs associated with any character in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5285 text block, then create a display block to handle them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5286 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5287 create_left_glyph_block (w, dl, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5288
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5289 /* If there are right glyphs associated with any character in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5290 text block, then create a display block to handle them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5291 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5292 create_right_glyph_block (w, dl);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5293
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5294 return ret_charcount;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5295 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5296
2518
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5297 /*
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 on Re-entrancy crashes, with backtraces given:
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5300
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5301 (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
5302 */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5303
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5304
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5305 /* 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
5306 loop through elements in the string creating display lines until we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5307 have covered the provided area. Simple really. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5308 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5309 generate_displayable_area (struct window *w, Lisp_Object disp_string,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5310 int xpos, int ypos, int width, int height,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5311 display_line_dynarr* dla,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5312 Charcount start_pos,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5313 face_index default_face)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5314 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5315 int yend = ypos + height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5316 Charcount s_zv;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5317 prop_block_dynarr *prop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5318 layout_bounds bounds;
2518
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5319 int depth = -1;
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5320
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5321 /* 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
5322 there is something to do. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5323 if (NILP (disp_string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5324 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5325
2518
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5326 /* See comment in regenerate_window() */
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5327 if (!in_display)
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5328 depth = enter_redisplay_critical_section ();
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5329
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5330 assert (dla);
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5331 Dynarr_reset (dla);
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5332
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5333 s_zv = string_char_length (disp_string);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5334
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5335 bounds.left_out = xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5336 bounds.right_out = xpos + width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5337 /* The inner boundaries mark where the glyph margins are located. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5338 bounds.left_in = bounds.left_out + window_left_margin_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5339 bounds.right_in = bounds.right_out - window_right_margin_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5340 /* We cannot fully calculate the whitespace boundaries as they
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5341 depend on the contents of the line being displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5342 bounds.left_white = bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5343 bounds.right_white = bounds.right_in;
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 while (ypos < yend)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5346 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5347 struct display_line dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5348 struct display_line *dlp;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5349 Charcount next_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5350 int local;
851
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5351 int pos_of_dlp = -1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5352
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5353 if (Dynarr_length (dla) < Dynarr_largest (dla))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5354 {
851
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5355 pos_of_dlp = Dynarr_length (dla);
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5356 dlp = Dynarr_atp (dla, pos_of_dlp);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5357 local = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5358 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5359 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5360 {
4207
62d532188a28 [xemacs-hg @ 2007-10-03 10:06:39 by didierv]
didierv
parents: 4187
diff changeset
5361 DISPLAY_LINE_INIT (dl);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5362 dlp = &dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5363 local = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5364 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5365
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5366 dlp->bounds = bounds;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5367 dlp->offset = 0;
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5368 Dynarr_lock (dla);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5369 next_pos = generate_string_display_line (w, disp_string, dlp, start_pos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5370 &prop, default_face);
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5371 Dynarr_unlock (dla);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5372 /* 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
5373 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
5374 the same chunk over and over again. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5375 if (next_pos == start_pos && next_pos < s_zv)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5376 start_pos++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5377 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5378 start_pos = next_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5379
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5380 dlp->ypos = ypos + dlp->ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5381 ypos = dlp->ypos + dlp->descent;
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 if (ypos > yend)
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 int visible_height = dlp->ascent + dlp->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5386
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5387 dlp->clip = (ypos - yend);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5388 visible_height -= dlp->clip;
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 (visible_height < VERTICAL_CLIP (w, 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5391 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5392 if (local)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5393 free_display_line (dlp);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5394 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5395 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5396 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5397 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5398 dlp->clip = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5399
4418
9bcdf9a3a783 Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents: 4207
diff changeset
5400 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
5401 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
5402 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
5403 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
5404 else
9bcdf9a3a783 Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents: 4207
diff changeset
5405 ABORT ();
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5406
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5407 /* #### This type of check needs to be done down in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5408 generate_display_line call. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5409 if (start_pos >= s_zv)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5410 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5411 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5412
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5413 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5414 Dynarr_free (prop);
2518
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5415
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5416 if (depth >= 0)
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5417 exit_redisplay_critical_section (depth);
428
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 /***************************************************************************/
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 /* window-regeneration routines */
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 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5426
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5427 /* For a given window and starting position in the buffer it contains,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5428 ensure that the TYPE display lines accurately represent the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5429 presentation of the window. We pass the buffer instead of getting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5430 it from the window since redisplay_window may have temporarily
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5431 changed it to the echo area buffer. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5432
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5433 static void
2518
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5434 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
5435 int type)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5436 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5437 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5438 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5439 int ypos = WINDOW_TEXT_TOP (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5440 int yend; /* set farther down */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5441 int yclip = WINDOW_TEXT_TOP_CLIP (w);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5442 int force;
2518
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5443 int depth = -1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5444
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5445 prop_block_dynarr *prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5446 layout_bounds bounds;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5447 display_line_dynarr *dla;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5448 int need_modeline;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5449
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5450 /* The lines had better exist by this point. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5451 if (!(dla = window_display_lines (w, type)))
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
5452 ABORT ();
2518
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5453
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5454 if (!in_display)
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5455 depth = enter_redisplay_critical_section ();
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5456
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5457 /* 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
5458 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
5459 /*
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 on Re-entrancy crashes, with backtraces given:
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 (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
5464 */
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5465
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5466 Dynarr_reset (dla);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5467 w->max_line_len = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5468
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5469 /* Normally these get updated in redisplay_window but it is possible
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5470 for this function to get called from some other points where that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5471 update may not have occurred. This acts as a safety check. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5472 if (!Dynarr_length (w->face_cachels))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5473 reset_face_cachels (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5474 if (!Dynarr_length (w->glyph_cachels))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5475 reset_glyph_cachels (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5476
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5477 Fset_marker (w->start[type], make_int (start_pos), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5478 Fset_marker (w->pointm[type], make_int (point), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5479 w->last_point_x[type] = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5480 w->last_point_y[type] = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5481
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5482 /* Make sure a modeline is in the structs if needed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5483 need_modeline = ensure_modeline_generated (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5484
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5485 /* 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
5486 generated in the case where one didn't exist. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5487 yend = WINDOW_TEXT_BOTTOM (w);
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 bounds = calculate_display_line_boundaries (w, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5490
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5491 /* 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
5492 if (MINI_WINDOW_P (w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5493 && (!NILP (Vminibuf_prompt) || !NILP (Vminibuf_preprompt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5494 && !echo_area_active (f)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5495 && start_pos == BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5496 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5497 struct prop_block pb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5498 Lisp_Object string;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5499 prop = Dynarr_new (prop_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5500
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5501 string = concat2(Vminibuf_preprompt, Vminibuf_prompt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5502 pb.type = PROP_MINIBUF_PROMPT;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5503 pb.data.p_string.str = XSTRING_DATA(string);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5504 pb.data.p_string.len = XSTRING_LENGTH(string);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5505 Dynarr_add (prop, pb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5506 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5507 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5508 prop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5509
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5510 /* When we are computing things for scrolling purposes, make
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5511 sure at least one line is always generated */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5512 force = (type == CMOTION_DISP);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5513
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5514 /* Make sure this is set always */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5515 /* Note the conversion at end */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5516 w->window_end_pos[type] = start_pos;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5517 while (ypos < yend || force)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5518 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5519 struct display_line dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5520 struct display_line *dlp;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5521 int local;
851
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5522 int pos_of_dlp = -1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5523
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5524 if (Dynarr_length (dla) < Dynarr_largest (dla))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5525 {
851
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5526 pos_of_dlp = Dynarr_length (dla);
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5527 dlp = Dynarr_atp (dla, pos_of_dlp);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5528 local = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5529 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5530 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5531 {
4207
62d532188a28 [xemacs-hg @ 2007-10-03 10:06:39 by didierv]
didierv
parents: 4187
diff changeset
5532 DISPLAY_LINE_INIT (dl);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5533 dlp = &dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5534 local = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5535 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5536
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5537 dlp->bounds = bounds;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5538 dlp->offset = 0;
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5539 Dynarr_lock (dla);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5540 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
5541 Dynarr_unlock (dla);
428
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 if (yclip > dlp->ascent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5544 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5545 /* this should never happen, but if it does just display the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5546 whole line */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5547 yclip = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5548 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5549
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5550 dlp->ypos = (ypos + dlp->ascent) - yclip;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5551 ypos = dlp->ypos + dlp->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5552
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5553 /* 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
5554 partial display line scrolling. */
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
5555 if (yclip)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5556 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5557 dlp->top_clip = yclip;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5558 yclip = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5559 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5560 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5561 dlp->top_clip = 0;
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 if (ypos > yend)
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 int visible_height = dlp->ascent + dlp->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5566
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5567 dlp->clip = (ypos - yend);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5568 /* Although this seems strange we could have a single very
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5569 tall line visible for which we need to account for both
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5570 the top clip and the bottom clip. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5571 visible_height -= (dlp->clip + dlp->top_clip);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5572
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5573 if (visible_height < VERTICAL_CLIP (w, 1) && !force)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5574 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5575 if (local)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5576 free_display_line (dlp);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5577 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5578 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5579 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5580 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5581 dlp->clip = 0;
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 if (dlp->cursor_elt != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5584 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5585 /* #### 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
5586 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
5587 period. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5588 if (w->last_point_x[type] == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5589 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5590 w->last_point_x[type] = dlp->cursor_elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5591 w->last_point_y[type] = Dynarr_length (dla);
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5594 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5595 /* #### 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
5596 twice. Yuck oh yuck. */
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5597 struct display_block *db;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5598
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5599 Dynarr_lock (dla);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5600 db = get_display_block_from_line (dlp, TEXT);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
5601 Dynarr_unlock (dla);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5602
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5603 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5604 dlp->cursor_elt = -1;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5607
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5608 if (dlp->num_chars > w->max_line_len)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5609 w->max_line_len = dlp->num_chars;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5610
4418
9bcdf9a3a783 Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents: 4207
diff changeset
5611 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
5612 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
5613 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
5614 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
5615 else
9bcdf9a3a783 Use Dynarr_increment instead of Dynarr_add when building a line in place.
Jerry James <james@xemacs.org>
parents: 4207
diff changeset
5616 ABORT ();
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5617
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5618 /* #### This isn't right, but it is close enough for now. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5619 w->window_end_pos[type] = start_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5620
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5621 /* #### This type of check needs to be done down in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5622 generate_display_line call. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5623 if (start_pos > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5624 break;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5625
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5626 force = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5627 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5628
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5629 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5630 Dynarr_free (prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5631
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5632 /* #### More not quite right, but close enough. */
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5633 /* Ben sez: apparently window_end_pos[] is measured
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5634 as the number of characters between the window end and the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5635 end of the buffer? This seems rather weirdo. What's
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5636 the justification for this?
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5637
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5638 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
5639 that can change. This representation allows initalizing with 0.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5640 */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5641 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
5642
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5643 if (need_modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5644 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5645 /* 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
5646 there when we first started working in this function. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5647 generate_modeline (w, Dynarr_atp (dla, 0), type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5648 }
2518
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5649
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5650 if (depth >= 0)
cc24b630b1d6 [xemacs-hg @ 2005-01-26 10:33:40 by ben]
ben
parents: 2500
diff changeset
5651 exit_redisplay_critical_section (depth);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5652 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5653
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5654 #define REGEN_INC_FIND_START_END \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5655 do { \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5656 /* Determine start and end of lines. */ \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5657 if (!Dynarr_length (cdla)) \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5658 return 0; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5659 else \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5660 { \
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5661 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
5662 { \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5663 dla_start = 1; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5664 } \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5665 else if (!Dynarr_atp (cdla, 0)->modeline \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5666 && !Dynarr_atp (ddla, 0)->modeline) \
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 dla_start = 0; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5669 } \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5670 else \
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
5671 ABORT (); /* structs differ */ \
826
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 dla_end = Dynarr_length (cdla) - 1; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5674 } \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5675 \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5676 start_pos = (Dynarr_atp (cdla, dla_start)->charpos \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5677 + Dynarr_atp (cdla, dla_start)->offset); \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5678 /* 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
5679 full regen. */ \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5680 if (startp != start_pos) \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5681 return 0; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5682 \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5683 /* 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
5684 if (pointm < start_pos) \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5685 return 0; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5686 \
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5687 } while (0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5688
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5689 /* This attempts to incrementally update the display structures. It
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5690 returns a boolean indicating success or failure. This function is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5691 very similar to regenerate_window_incrementally and is in fact only
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5692 called from that function. However, because of the nature of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5693 changes it deals with it sometimes makes different assumptions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5694 which can lead to success which are much more difficult to make
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5695 when dealing with buffer changes. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5696
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5697 static int
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5698 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
5699 Charbpos pointm,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5700 Charcount beg_unchanged,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5701 Charcount end_unchanged)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5702 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5703 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5704 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5705 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5706
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5707 int dla_start = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5708 int dla_end, line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5709 int first_line, last_line;
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5710 Charbpos start_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5711 /* 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
5712 definitely want its value to survive between passes. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5713 prop_block_dynarr *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5714
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5715 /* 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
5716 been incremented, then fail. I'm not sure of the exact circumstances
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5717 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
5718 reasonable happening. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5719 if (!point_visible (w, pointm, CURRENT_DISP)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5720 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5721 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5722
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5723 /* 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
5724 go ahead and proceed with the optimization attempt. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5725 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5726 || pointm != marker_position (w->last_point[CURRENT_DISP]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5727 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5728 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5729 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5730 struct frame *sel_f = device_selected_frame (d);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5731 int success = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5732
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5733 if (w->last_point_x[CURRENT_DISP] != -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5734 && w->last_point_y[CURRENT_DISP] != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5735 {
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 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5738 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5739 /* 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
5740 displaying the current line or column. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5741 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5742 success = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5743 }
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 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5746 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5747 if (f->modeline_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5748 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5749 success = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5750 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5751
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5752 if (!success)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5753 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5754 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5755
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5756 if (beg_unchanged == -1 && end_unchanged == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5757 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5758
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5759 /* assert: There are no buffer modifications or they are all below the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5760 visible region. We assume that regenerate_window_incrementally has
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5761 not called us unless this is true. */
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 REGEN_INC_FIND_START_END;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5764
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5765 /* If the changed are starts before the visible area, give up. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5766 if (beg_unchanged < startp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5767 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5768
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5769 /* Find what display line the extent changes first affect. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5770 line = dla_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5771 while (line <= dla_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5772 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5773 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
5774 Charbpos lstart = dl->charpos + dl->offset;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5775 Charbpos lend = dl->end_charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5776
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5777 if (beg_unchanged >= lstart && beg_unchanged <= lend)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5778 break;
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 line++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5781 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5782
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5783 /* 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
5784 moved return success otherwise fail in order to be safe. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5785 if (line > dla_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5786 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5787 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5788 && pointm == marker_position (w->last_point[CURRENT_DISP]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5789 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5790 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5791 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5792 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5793
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5794 /* 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
5795 begin redrawing lines as long as we are still in the affected
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5796 region and the line's size and positioning don't change.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5797 Otherwise we fail. If we fail we will have altered the desired
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5798 structs which could lead to an assertion failure. However, if we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5799 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
5800 will actually end up being safe. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5801 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5802 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5803 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5804 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5805
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5806 first_line = last_line = line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5807 while (line <= dla_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5808 {
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
5809 Charbpos old_start, old_end;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5810 struct display_line *cdl = Dynarr_atp (cdla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5811 struct display_line *ddl = Dynarr_atp (ddla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5812 struct display_block *db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5813 int initial_size;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5814
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5815 assert (cdl->charpos == ddl->charpos);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5816 assert (cdl->end_charpos == ddl->end_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5817 assert (cdl->offset == ddl->offset);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5818
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5819 db = get_display_block_from_line (ddl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5820 initial_size = Dynarr_length (db->runes);
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5821 old_start = ddl->charpos + ddl->offset;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5822 old_end = ddl->end_charpos + ddl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5823
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5824 /* 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
5825 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
5826 we'll have the necessary propagation data. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5827 if (line == first_line && ddl->used_prop_data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5828 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5829
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
5830 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
5831 &prop, DESIRED_DISP);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5832 ddl->offset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5833
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5834 /* #### 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
5835 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
5836 information when originally created by a full
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
5837 regeneration. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5838 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5839 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5840 Dynarr_free (prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5841 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5842 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5843
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5844 /* 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
5845 cursor has disappeared or disappeared, fail. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5846 db = get_display_block_from_line (ddl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5847 if (cdl->ypos != ddl->ypos
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5848 || cdl->ascent != ddl->ascent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5849 || cdl->descent != ddl->descent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5850 || cdl->top_clip != ddl->top_clip
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5851 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5852 || (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
5853 || old_start != ddl->charpos
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5854 || old_end != ddl->end_charpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5855 || initial_size != Dynarr_length (db->runes))
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 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5858 }
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 if (ddl->cursor_elt != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5861 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5862 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5863 w->last_point_y[DESIRED_DISP] = line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5864 }
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 last_line = line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5867
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5868 /* 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
5869 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
5870 if (end_unchanged <= ddl->end_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5871 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5872 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5873 line++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5874 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5875
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5876 redisplay_update_line (w, first_line, last_line, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5877 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5878 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5879
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5880 /* Attempt to update the display data structures based on knowledge of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5881 the changed region in the buffer. Returns a boolean indicating
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5882 success or failure. If this function returns a failure then a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5883 regenerate_window _must_ be performed next in order to maintain
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5884 invariants located here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5885
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5886 static int
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5887 regenerate_window_incrementally (struct window *w, Charbpos startp,
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5888 Charbpos pointm)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5889 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5890 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5891 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5892 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5893 Charcount beg_unchanged, end_unchanged;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5894 Charcount extent_beg_unchanged, extent_end_unchanged;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5895
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5896 int dla_start = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5897 int dla_end, line;
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5898 Charbpos start_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5899
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5900 /* If this function is called, the current and desired structures
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5901 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
5902 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5903
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5904 /* We don't handle minibuffer windows yet. The minibuffer prompt
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5905 screws us up. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5906 if (MINI_WINDOW_P (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5907 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5908
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5909 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5910 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5911 ? -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5912 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5913
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5914 /* 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
5915 and succeed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5916 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5917 return regenerate_window_extents_only_changed (w, startp, pointm,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5918 extent_beg_unchanged,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5919 extent_end_unchanged);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5920
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5921 /* We can't deal with deleted newlines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5922 if (BUF_NEWLINE_WAS_DELETED (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5923 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5924
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5925 beg_unchanged = BUF_BEGIN_UNCHANGED (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5926 end_unchanged = (BUF_END_UNCHANGED (b) == -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5927 ? -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5928 : BUF_Z (b) - BUF_END_UNCHANGED (b));
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 REGEN_INC_FIND_START_END;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5931
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5932 /* If the changed area starts before the visible area, give up. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5933 if (beg_unchanged < startp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5934 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5935
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5936 /* Find what display line the buffer changes first affect. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5937 line = dla_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5938 while (line <= dla_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5939 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5940 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
5941 Charbpos lstart = dl->charpos + dl->offset;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5942 Charbpos lend = dl->end_charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5943
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5944 if (beg_unchanged >= lstart && beg_unchanged <= lend)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5945 break;
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 line++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5948 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5949
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5950 /* 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
5951 moved return success otherwise fail in order to be safe. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5952 if (line > dla_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5953 return regenerate_window_extents_only_changed (w, startp, pointm,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5954 extent_beg_unchanged,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5955 extent_end_unchanged);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5956 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5957 /* At this point we know what line the changes first affect. We
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5958 now redraw that line. If the changes are contained within it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5959 we are going to succeed and can update just that one line.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5960 Otherwise we fail. If we fail we will have altered the desired
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5961 structs which could lead to an assertion failure. However, if
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5962 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
5963 so we will actually end up being safe. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5964 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5965 prop_block_dynarr *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5966 struct display_line *cdl = Dynarr_atp (cdla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5967 struct display_line *ddl = Dynarr_atp (ddla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5968
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5969 assert (cdl->charpos == ddl->charpos);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5970 assert (cdl->end_charpos == ddl->end_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5971 assert (cdl->offset == ddl->offset);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5972
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5973 /* If the line continues to next display line, fail. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5974 if (ddl->line_continuation)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5975 return 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5976
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5977 /* If the line was generated using propagation data, fail. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5978 if (ddl->used_prop_data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5979 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5980
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
5981 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
5982 &prop, DESIRED_DISP);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5983 ddl->offset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5984
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5985 /* 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
5986 guarantee that more than just the one line is affected. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5987 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5988 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5989 Dynarr_free (prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5990 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5991 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5992
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5993 /* If the line continues to next display line, fail. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5994 if (ddl->line_continuation)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5995 return 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5996
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5997 /* 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
5998 cursor has disappeared or disappeared, fail. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5999 if (cdl->ypos != ddl->ypos
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6000 || cdl->ascent != ddl->ascent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6001 || cdl->descent != ddl->descent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6002 || cdl->top_clip != ddl->top_clip
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6003 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6004 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1))
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 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6007 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6008
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6009 /* 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
6010 business. Update everything and return success. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6011 if (end_unchanged >= ddl->charpos && end_unchanged <= ddl->end_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6012 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6013 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6014 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6015 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp),
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 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6018 w->buffer);
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 if (ddl->cursor_elt != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6021 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6022 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6023 w->last_point_y[DESIRED_DISP] = line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6024 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6025
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6026 redisplay_update_line (w, line, line, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6027 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6028
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6029 /* #### 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
6030 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
6031 cache directly. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6032 Dynarr_reset (w->line_start_cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6033
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6034 /* 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
6035 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
6036 successfully updated that area. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6037 if (extent_beg_unchanged != -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6038 && extent_beg_unchanged >= beg_unchanged
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6039 && extent_beg_unchanged < end_unchanged)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6040 extent_beg_unchanged = end_unchanged;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6041
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6042 if (extent_end_unchanged != -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6043 && extent_end_unchanged >= beg_unchanged
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6044 && extent_end_unchanged < end_unchanged)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6045 extent_end_unchanged = beg_unchanged - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6046
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6047 if (extent_end_unchanged <= extent_beg_unchanged)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6048 extent_beg_unchanged = extent_end_unchanged = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6049
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6050 /* 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
6051 buffer changes update succeeded this probably will to.
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6052 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
6053 the line because we checked before entering the loop. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6054 if (extent_beg_unchanged != -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6055 && extent_end_unchanged != -1
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6056 && ((extent_beg_unchanged < ddl->charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6057 || (extent_end_unchanged > ddl->end_charpos)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6058 return regenerate_window_extents_only_changed (w, startp, pointm,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6059 extent_beg_unchanged,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6060 extent_end_unchanged);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6061 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6062 return 1;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6065
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6066 /* Oh, well. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6067 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6068 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6069
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6070 /* Given a window and a point, update the given display lines such
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6071 that point is displayed in the middle of the window.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6072 Return the window's new start position. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6073
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6074 static Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6075 regenerate_window_point_center (struct window *w, Charbpos point, int type)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6076 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6077 Charbpos startp;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6078
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6079 /* 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
6080 window height can be calculated correctly. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6081 ensure_modeline_generated (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6082
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6083 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6084 regenerate_window (w, startp, point, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6085 Fset_marker (w->start[type], make_int (startp), w->buffer);
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 return startp;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6088 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6089
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6090 /* Given a window and a set of display lines, return a boolean
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6091 indicating whether the given point is contained within. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6092
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6093 static int
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6094 point_visible (struct window *w, Charbpos point, int type)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6095 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6096 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6097 display_line_dynarr *dla = window_display_lines (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6098 int first_line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6099
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6100 if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6101 first_line = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6102 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6103 first_line = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6104
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6105 if (Dynarr_length (dla) > first_line)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6106 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6107 Charbpos start, end;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6108 struct display_line *dl = Dynarr_atp (dla, first_line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6109
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6110 start = dl->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6111 end = BUF_Z (b) - w->window_end_pos[type] - 1;
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 (point >= start && point <= end)
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 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6116 {
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
6117 dl = Dynarr_lastp (dla);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6118
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6119 if (point >= (dl->charpos + dl->offset)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6120 && point <= (dl->end_charpos + dl->offset))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6121 return !dl->clip;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6122 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6123 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6124 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6125 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6126 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6127 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6128 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6129 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6130 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6131 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6132 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6133 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6134
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6135 /* Return pixel position the middle of the window, not including the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6136 modeline and any potential horizontal scrollbar. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6137
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6138 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6139 window_half_pixpos (struct window *w)
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 return WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6142 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6143
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6144 /* Return the display line which is currently in the middle of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6145 window W for display lines TYPE. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6146
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6147 int
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6148 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
6149 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6150 display_line_dynarr *dla;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6151 int half;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6152 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6153 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6154
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6155 if (type == CMOTION_DISP)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6156 regenerate_window (w, start, point, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6157
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6158 dla = window_display_lines (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6159 half = window_half_pixpos (w);
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 for (elt = first_elt; elt < Dynarr_length (dla); elt++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6162 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6163 struct display_line *dl = Dynarr_atp (dla, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6164 int line_bot = dl->ypos + dl->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6165
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6166 if (line_bot > half)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6167 return elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6168 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6169
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6170 /* 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
6171 being displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6172 return -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6173 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6174
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6175 /* 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
6176 the line which is in the middle of the window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6177
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6178 Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6179 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
6180 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6181 /* line_at_center will regenerate the display structures, if necessary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6182 int line = line_at_center (w, type, start, point);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6183
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6184 if (line == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6185 return BUF_ZV (XBUFFER (w->buffer));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6186 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6187 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6188 display_line_dynarr *dla = window_display_lines (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6189 struct display_line *dl = Dynarr_atp (dla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6190
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6191 return dl->charpos;
428
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6194
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6195 /* For a given window, ensure that the current visual representation
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6196 is accurate. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6197
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6198 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6199 redisplay_window (Lisp_Object window, int skip_selected)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6200 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6201 struct window *w = XWINDOW (window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6202 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6203 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6204 Lisp_Object old_buffer = w->buffer;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6205 Lisp_Object the_buffer = w->buffer;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6206 struct buffer *b;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6207 int echo_active = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6208 int startp = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6209 int pointm;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6210 int old_startp = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6211 int old_pointm = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6212 int selected_in_its_frame;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6213 int selected_globally;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6214 int skip_output = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6215 int truncation_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6216 int inactive_minibuffer =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6217 (MINI_WINDOW_P (w) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6218 (f != device_selected_frame (d)) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6219 !is_surrogate_for_selected_frame (f));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6220
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6221 /* #### In the new world this function actually does a bunch of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6222 optimizations such as buffer-based scrolling, but none of that is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6223 implemented yet. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6224
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6225 /* If this is a combination window, do its children; that's all.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6226 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
6227 skip_selected here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6228 if (!NILP (w->vchild))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6229 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6230 redisplay_windows (w->vchild, skip_selected);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6231 return;
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 if (!NILP (w->hchild))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6234 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6235 redisplay_windows (w->hchild, skip_selected);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6236 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6237 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6238
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6239 /* Is this window the selected window on its frame? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6240 selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6241 selected_globally =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6242 selected_in_its_frame &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6243 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6244 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6245 XFRAME(DEVICE_SELECTED_FRAME(d)) == f;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6246 if (skip_selected && selected_in_its_frame)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6247 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6248
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6249 /* It is possible that the window is not fully initialized yet. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6250 if (NILP (w->buffer))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6251 return;
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 if (MINI_WINDOW_P (w) && echo_area_active (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6254 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6255 w->buffer = the_buffer = Vecho_area_buffer;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6256 echo_active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6257 }
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 b = XBUFFER (w->buffer);
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 if (echo_active)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6262 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6263 old_pointm = selected_globally
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6264 ? BUF_PT (b)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6265 : marker_position (w->pointm[CURRENT_DISP]);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6266 pointm = 1;
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 else
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 if (selected_globally)
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 pointm = BUF_PT (b);
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 else
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 pointm = marker_position (w->pointm[CURRENT_DISP]);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6277
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6278 if (pointm < BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6279 pointm = BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6280 else if (pointm > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6281 pointm = BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6282 }
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 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm), the_buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6285
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6286 /* 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
6287 cache elements. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6288 if ((!echo_active && b != window_display_buffer (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6289 || !Dynarr_length (w->face_cachels)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6290 || f->faces_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6291 reset_face_cachels (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6292 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6293 mark_face_cachels_as_not_updated (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6294
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6295 /* Ditto the glyph cache elements, although we do *not* invalidate
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6296 the cache purely because glyphs have changed - this is now
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6297 handled by the dirty flag.*/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6298 if ((!echo_active && b != window_display_buffer (w))
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6299 || !Dynarr_length (w->glyph_cachels) || f->faces_changed)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6300 reset_glyph_cachels (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6301 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6302 mark_glyph_cachels_as_not_updated (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6303
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6304 /* 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
6305 to find a new starting position. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6306 if (!MINI_WINDOW_P (w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6307 && !EQ (Fmarker_buffer (w->start[CURRENT_DISP]), w->buffer))
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 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
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 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6312 }
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 if (echo_active)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6315 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6316 old_startp = marker_position (w->start[CURRENT_DISP]);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6317 startp = 1;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6320 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6321 startp = marker_position (w->start[CURRENT_DISP]);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6322 if (startp < BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6323 startp = BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6324 else if (startp > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6325 startp = BUF_ZV (b);
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 Fset_marker (w->start[DESIRED_DISP], make_int (startp), the_buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6328
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6329 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
6330 (unsigned int) window_truncation_on (w));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6331
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6332 /* 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
6333 should display from there and change point, if necessary, to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6334 ensure that it is visible. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6335 if (w->force_start || inactive_minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6336 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6337 w->force_start = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6338 w->last_modified[DESIRED_DISP] = Qzero;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6339 w->last_facechange[DESIRED_DISP] = Qzero;
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 regenerate_window (w, startp, pointm, DESIRED_DISP);
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 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer)
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 pointm = point_at_center (w, DESIRED_DISP, 0, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6346
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6347 if (selected_globally)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6348 BUF_SET_PT (b, pointm);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6349
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6350 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6351 the_buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6352
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6353 /* #### 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
6354 location marked properly. FIX ME FIX ME FIX ME */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6355 regenerate_window (w, startp, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6356 }
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 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6359 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6360
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6361 /* If nothing has changed since the last redisplay, then we just
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6362 need to make sure that point is still visible. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6363 if (XINT (w->last_modified[CURRENT_DISP]) >= BUF_MODIFF (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6364 && XINT (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6365 && pointm >= startp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6366 /* 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
6367 temporary change to the echo area. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6368 && !(MINI_WINDOW_P (w) && f->buffers_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6369 && !f->frame_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6370 && !truncation_changed
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6371 /* 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
6372 && (!w->start_at_line_beg || beginning_of_line_p (b, startp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6373 )
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6374 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6375 /* Check if the cursor has actually moved. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6376 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6377 && pointm == marker_position (w->last_point[CURRENT_DISP])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6378 && selected_globally
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6379 && !w->windows_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6380 && !f->clip_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6381 && !f->extents_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6382 && !f->faces_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6383 && !f->glyphs_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6384 && !f->subwindows_changed
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6385 /* && !f->subwindows_state_changed*/
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6386 && !f->point_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6387 && !f->windows_structure_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6388 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6389 /* If not, we're done. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6390 if (f->modeline_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6391 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6392
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6393 skip_output = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6394 goto regeneration_done;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6397 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6398 /* 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
6399 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
6400 do things the hard way. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6401 if (!w->windows_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6402 && !f->clip_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6403 && !f->extents_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6404 && !f->faces_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6405 && !f->glyphs_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6406 && !f->subwindows_changed
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6407 /* && !f->subwindows_state_changed*/
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6408 && !f->windows_structure_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6409 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6410 if (point_visible (w, pointm, CURRENT_DISP)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6411 && w->last_point_x[CURRENT_DISP] != -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6412 && w->last_point_y[CURRENT_DISP] != -1)
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 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6415 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6416 /* Always regenerate in case it is displaying
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6417 the current line or column. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6418 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6419
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6420 skip_output = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6421 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6422 }
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 else if (!selected_in_its_frame && !f->point_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6425 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6426 if (f->modeline_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6427 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6429 skip_output = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6430 goto regeneration_done;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6433
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6434 /* 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
6435 the brute force method. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6436 regenerate_window (w, startp, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6437
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6438 if (point_visible (w, pointm, DESIRED_DISP))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6439 goto regeneration_done;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6442
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6443 /* 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
6444 line, in which case find a new starting point. We also recenter
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6445 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
6446 up with a blank window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6447 else if (((w->start_at_line_beg || MINI_WINDOW_P (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6448 && !(startp == BUF_BEGV (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6449 || BUF_FETCH_CHAR (b, startp - 1) == '\n'))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6450 || (pointm == startp &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6451 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6452 startp < marker_position (w->last_start[CURRENT_DISP]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6453 || (startp == BUF_ZV (b)))
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 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
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 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6458 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6459 /* See if we can update the data structures locally based on
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6460 knowledge of what changed in the buffer. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6461 else if (!w->windows_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6462 && !f->clip_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6463 && !f->faces_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6464 && !f->glyphs_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6465 && !f->subwindows_changed
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6466 /* && !f->subwindows_state_changed*/
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6467 && !f->windows_structure_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6468 && !f->frame_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6469 && !truncation_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6470 && pointm >= startp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6471 && regenerate_window_incrementally (w, startp, pointm))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6472 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6473 if (f->modeline_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6474 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6475 || XINT (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6476 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6477
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6478 skip_output = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6479 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6480 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6481 /* #### This is where a check for structure based scrolling would go. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6482 /* If all else fails, try just regenerating and see what happens. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6483 else
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 regenerate_window (w, startp, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6486
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6487 if (point_visible (w, pointm, DESIRED_DISP))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6488 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6489 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6490
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6491 /* We still haven't gotten the window regenerated with point
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6492 visible. Next we try scrolling a little and see if point comes
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6493 back onto the screen. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6494 if (scroll_step > 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6495 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6496 int scrolled = scroll_conservatively;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6497 for (; scrolled >= 0; scrolled -= scroll_step)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6498 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6499 startp = vmotion (w, startp,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6500 (pointm < startp) ? -scroll_step : scroll_step, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6501 regenerate_window (w, startp, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6502
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6503 if (point_visible (w, pointm, DESIRED_DISP))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6504 goto regeneration_done;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6507
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6508 /* 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
6509 the screen, so just center it and be done with it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6510 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6511
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 regeneration_done:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6514
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6515 /* If the window's frame is changed then reset the current display
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6516 lines in order to force a full repaint. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6517 if (f->frame_changed)
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 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
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 Dynarr_reset (cla);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6522 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6523
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6524 /* Must do this before calling redisplay_output_window because it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6525 sets some markers on the window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6526 if (echo_active)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6527 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6528 w->buffer = old_buffer;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6529 Fset_marker (w->pointm[DESIRED_DISP], make_int (old_pointm), old_buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6530 Fset_marker (w->start[DESIRED_DISP], make_int (old_startp), old_buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6531 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6532
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6533 /* These also have to be set before calling redisplay_output_window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6534 since it sets the CURRENT_DISP values based on them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6535 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6536 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6537 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6538 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6539
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6540 if (!skip_output)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6541 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6542 Charbpos start = marker_position (w->start[DESIRED_DISP]);
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6543 Charbpos end = (w->window_end_pos[DESIRED_DISP] == -1
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6544 ? BUF_ZV (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6545 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6546 /* Don't pollute the cache if not sure if we are correct */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6547 if (w->start_at_line_beg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6548 update_line_start_cache (w, start, end, pointm, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6549 redisplay_output_window (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6550 /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6551 * If we just displayed the echo area, the line start cache is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6552 * no longer valid, because the minibuffer window is associated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6553 * with the window now.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6554 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6555 if (echo_active)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6556 w->line_cache_last_updated = make_int (-1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6557 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6558
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6559 /* #### This should be dependent on face changes and will need to be
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6560 somewhere else once tty updates occur on a per-frame basis. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6561 mark_face_cachels_as_clean (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6562
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
6563 /* The glyph cachels only get dirty if someone changed something.
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
6564 Since redisplay has now effectively ended we can reset the dirty
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
6565 flag since everything must be up-to-date. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6566 if (glyphs_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6567 mark_glyph_cachels_as_clean (w);
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 w->windows_changed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6570 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6571
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6572 /* Call buffer_reset_changes for all buffers present in any window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6573 currently visible in all frames on all devices. #### There has to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6574 be a better way to do this. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6575
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6576 static int
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
6577 reset_buffer_changes_mapfun (struct window *w, void *UNUSED (closure))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6578 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6579 buffer_reset_changes (XBUFFER (w->buffer));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6580 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6581 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6582
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6583 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6584 reset_buffer_changes (void)
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 Lisp_Object 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 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
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 struct frame *f = XFRAME (XCAR (frmcons));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6591
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6592 if (FRAME_REPAINT_P (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6593 map_windows (f, reset_buffer_changes_mapfun, 0);
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6596
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6597 /* Ensure that all windows underneath the given window in the window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6598 hierarchy are correctly displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6599
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6600 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6601 redisplay_windows (Lisp_Object window, int skip_selected)
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 for (; !NILP (window) ; window = XWINDOW (window)->next)
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 redisplay_window (window, skip_selected);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6606 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6607 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6608
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6609 /* 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
6610 in_display is 0 when this is called.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6611 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
6612 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
6613 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
6614
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6615 NEVER signal an error in these functions.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6616 */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6617
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6618 void
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6619 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
6620 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6621 Vpost_redisplay_actions = nconc2 (Vpost_redisplay_actions,
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6622 list1 (Fcons (make_opaque_ptr
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6623 ((void *) fun), arg)));
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6624 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6625
1320
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6626 static int running_post_redisplay_actions;
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6627
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6628 static void
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6629 run_post_redisplay_actions (void)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6630 {
1320
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6631 int depth;
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6632
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6633 if (running_post_redisplay_actions)
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6634 return;
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6635
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6636 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
6637 /* 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
6638 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
6639 current ones. */
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6640 while (!NILP (Vpost_redisplay_actions))
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6641 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6642 Lisp_Object car = XCAR (Vpost_redisplay_actions);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6643 void (*fun) (Lisp_Object) =
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6644 (void (*)(Lisp_Object)) get_opaque_ptr (XCAR (car));
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6645 (*fun) (XCDR (car));
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6646 free_opaque_ptr (XCAR (car));
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6647 free_cons (car);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6648 Vpost_redisplay_actions = XCDR (Vpost_redisplay_actions);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6649 }
1320
4f58e6e65139 [xemacs-hg @ 2003-02-22 02:08:32 by ben]
ben
parents: 1318
diff changeset
6650 unbind_to (depth);
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6651 }
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 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6654
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6655 static Lisp_Object
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
6656 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
6657 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6658 assert (!in_display);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6659 return Qnil;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6660 }
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 #endif
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6663
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6664 /* 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
6665 the following to happen:
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6666
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6667 1) garbage collection
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6668 2) QUIT
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6669 3) any non-local exits
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6670 4) frame size changes
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6671 5) deletion of any buffers, windows, frames, etc.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6672 6) modification of buffer text
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6673 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
6674 generate_displayable_area())
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6675
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6676 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
6677 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
6678 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
6679 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
6680 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
6681 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
6682 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
6683 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
6684 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
6685 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
6686 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
6687 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
6688 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
6689 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
6690 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
6691 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
6692 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
6693 it's just too dangerous otherwise. See below.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6694
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6695 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
6696 (#7) and take appropriate corrective action.
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6697
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6698 To help debug potential problems, we arrange (when
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6699 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
6700 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
6701 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
6702 garbage_collect_1().
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6703
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6704 #### 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
6705 preempting redisplay. */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6706
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6707 /* Count of number of recursive times we call
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6708 enter_redisplay_critical_section() or
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6709 enter_redisplay_critical_section_maybe().
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6710 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
6711 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
6712 done. */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6713 static int in_display_nesting;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6714
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6715 static Lisp_Object
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
6716 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
6717 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6718 if (!hold_frame_size_changes)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6719 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6720 /* 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
6721 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
6722 (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
6723 frames have frame changes held up?
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6724
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6725 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
6726 --ben */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6727 Lisp_Object frmcons, devcons, concons;
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
6728
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6729 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6730 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6731 struct frame *f = XFRAME (XCAR (frmcons));
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6732 if (f->size_change_pending)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6733 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
6734 }
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 return Qnil;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6737 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6738
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6739 /* 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
6740 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
6741 */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6742
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6743 int
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6744 begin_hold_frame_size_changes (void)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6745 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6746 int depth = specpdl_depth ();
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6747 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
6748 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
6749 return depth;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6750 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6751
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6752 int
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6753 enter_redisplay_critical_section (void)
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 int depth = specpdl_depth ();
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6756
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6757 /* 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
6758 assert (!in_display);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6759 begin_hold_frame_size_changes ();
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6760 /* 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
6761 commit_ritual_suicide() can be used. */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6762 internal_bind_int (&in_display, 0);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6763 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
6764 #ifdef ERROR_CHECK_TRAPPING_PROBLEMS
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6765 /* 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
6766 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
6767 something_happened++;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6768 /* Verify that no nonlocal exits blow past us. */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6769 record_unwind_protect (commit_ritual_suicide, Qnil);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6770 #endif
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6771 in_display++;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6772
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6773 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
6774 /* 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
6775 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
6776 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
6777 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
6778 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
6779 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
6780 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
6781 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
6782 it's not in an especially tricky place. */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6783 begin_dont_check_for_quit ();
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6784 return depth;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6785 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6786
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6787 void
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6788 exit_redisplay_critical_section (int depth)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6789 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6790 in_display--;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6791 assert (!in_display);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6792 unbind_to (depth);
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 run_post_redisplay_actions ();
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6795 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6796
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6797 /* 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
6798 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
6799 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
6800 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
6801
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6802 int
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6803 enter_redisplay_critical_section_maybe (void)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6804 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6805 if (!in_display)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6806 return enter_redisplay_critical_section ();
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6807 else
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6808 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
6809 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6810
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6811 void
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6812 exit_redisplay_critical_section_maybe (int depth)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6813 {
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6814 if (in_display_nesting == 1)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6815 exit_redisplay_critical_section (depth);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6816 else
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6817 unbind_to (depth);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6818 }
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6819
1279
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6820 /* 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
6821 Return non-zero if pre-empted. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6822
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6823 int
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6824 redisplay_frame (struct frame *f, int preemption_check)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6825 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6826 struct device *d = XDEVICE (f->device);
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6827 int depth;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6828
1279
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6829 assert (f->init_finished);
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6830
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6831 /* 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
6832 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
6833 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
6834 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
6835 point. --ben */
1279
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6836 if (FRAME_STREAM_P (f)) /* nothing to do */
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6837 return 0;
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6838
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6839 /* 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
6840 generate_displayable_area(). */
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6841 if (in_display)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6842 return 1;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6843
545
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6844 if (preemption_check
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6845 && !DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6846 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6847 /* The preemption check itself takes a lot of time,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6848 so normally don't do it here. We do it if called
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6849 from Lisp, though (`redisplay-frame'). */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6850 int preempted;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6851
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6852 REDISPLAY_PREEMPTION_CHECK;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6853 if (preempted)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6854 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6855 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6856
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6857 if (!internal_equal (f->old_buffer_alist, f->buffer_alist, 0))
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 Lisp_Object frame;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6860
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6861 f->old_buffer_alist = Freplace_list (f->old_buffer_alist,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6862 f->buffer_alist);
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
6863 frame = wrap_frame (f);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6864 va_run_hook_with_args (Qbuffer_list_changed_hook, 1, frame);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6865 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6866
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6867 /* Before we put a hold on frame size changes, attempt to process
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6868 any which are already pending. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6869 if (f->size_change_pending)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6870 change_frame_size (f, f->new_height, f->new_width, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6871
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6872 /* If frame size might need to be changed, due to changed size
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6873 of toolbars, scrollbars etc, change it now */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6874 if (f->size_slipped)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6875 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6876 adjust_frame_size (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6877 assert (!f->size_slipped);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6878 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6879
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6880 /* 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
6881 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
6882 `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
6883 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
6884 is difficult to debug). */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6885
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6886 #ifdef HAVE_MENUBARS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6887 /* Update the menubar. It is done first since it could change
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6888 the menubar's visibility. This way we avoid having flashing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6889 caused by an Expose event generated by the visibility change
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6890 being handled. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6891 update_frame_menubars (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6892 #endif /* HAVE_MENUBARS */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6893 #ifdef HAVE_TOOLBARS
905
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6894 /* 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
6895 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
6896 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
6897 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
6898 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
6899 - and finally update the toolbars. */
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6900 update_frame_toolbars_geometry (f);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6901 #endif /* HAVE_TOOLBARS */
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6902 /* 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
6903 size changes can occur, thus we separately update the gutter
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6904 geometry here if it needs it. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6905 update_frame_gutter_geometry (f);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6906
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6907 /* 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
6908 if (f->clear)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6909 f->frame_changed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6910
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6911 /* Invalidate the subwindow caches. We use subwindows_changed here
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6912 to cause subwindows to get instantiated. This is because
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6913 subwindows_state_changed is less strict - dealing with things
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6914 like the clicked state of button. We have to do this before
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6915 redisplaying the gutters as subwindows get unmapped in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6916 process.*/
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6917 if (f->frame_changed)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6918 reset_frame_subwindow_instance_cache (f);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6919
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6920 if (f->frame_changed || f->subwindows_changed)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6921 {
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6922 /* we have to do this so the gutter gets regenerated. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6923 reset_gutter_display_lines (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6924 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6925
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6926 depth = enter_redisplay_critical_section ();
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6927
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6928 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6929
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6930 /* See comments in enter_redisplay_critical_section() */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6931
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6932 MAYBE_DEVMETH (d, frame_output_begin, (f));
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6933
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6934 /* 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
6935 efforts won't get undone. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6936
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6937 /* This can call lisp, but redisplay is protected by binding
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6938 inhibit_quit. More importantly the code involving display lines
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6939 *assumes* that GC will not happen and so does not GCPRO
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6940 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
6941 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
6942
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
6943 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
6944 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
6945 an inconsistent state. */
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6946 update_frame_gutters (f);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6947
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6948 /* Erase the frame before outputting its contents. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6949 if (f->clear)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6950 {
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6951 MAYBE_DEVMETH (d, clear_frame, (f));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6952 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6953
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6954 /* Do the selected window first. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6955 redisplay_window (FRAME_SELECTED_WINDOW (f), 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6956
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6957 /* Then do the rest. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6958 redisplay_windows (f->root_window, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6959
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6960 MAYBE_DEVMETH (d, frame_output_end, (f));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6961
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6962 update_frame_title (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6963
905
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6964 #ifdef HAVE_TOOLBARS
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6965 /* 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
6966 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
6967 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
6968 possible in a single pass. */
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6969 update_frame_toolbars (f);
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6970 #endif /* HAVE_TOOLBARS */
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6971
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6972 CLASS_RESET_CHANGED_FLAGS (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6973 f->window_face_cache_reset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6974 f->echo_area_garbaged = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6975 f->clear = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6976
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6977 if (!f->size_change_pending)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6978 f->size_changed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6979
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6980 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6981
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6982 /* Allow frame size changes to occur again. */
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6983 exit_redisplay_critical_section (depth);
428
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 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6986 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6987
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6988 /* Ensure that all frames on the given device are correctly displayed.
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6989 If AUTOMATIC is non-zero, and the device implementation indicates
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6990 no automatic redisplay, as printers do, then the device is not
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6991 redisplayed. AUTOMATIC is set to zero when called from lisp
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6992 functions (redraw-device) and (redisplay-device), and to non-zero
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6993 when called from "lazy" redisplay();
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6994 */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6995
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6996 static int
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6997 redisplay_device (struct device *d, int automatic)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6998 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6999 Lisp_Object frame, frmcons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7000 int size_change_failed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7001 struct frame *f;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7002
545
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7003 if (automatic && DEVICE_IMPL_FLAG (d, XDEVIMPF_NO_AUTO_REDISPLAY))
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
7004 return 0;
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
7005
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7006 if (DEVICE_STREAM_P (d)) /* nothing to do */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7007 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7008
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7009 /* 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
7010 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
7011 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
7012 device. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7013 if (NILP (DEVICE_SELECTED_FRAME (d)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7014 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7015
545
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7016 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
7017 {
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7018 int preempted;
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7019 REDISPLAY_PREEMPTION_CHECK;
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7020 if (preempted)
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7021 return 1;
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7022 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7023
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7024 /* Always do the selected frame first. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7025 frame = DEVICE_SELECTED_FRAME (d);
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 f = XFRAME (frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7028
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7029 if (f->icon_changed || f->windows_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7030 update_frame_icon (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 (FRAME_REPAINT_P (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7033 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7034 if (CLASS_REDISPLAY_FLAGS_CHANGEDP(f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7035 {
588
ed8e2ee8d29d [xemacs-hg @ 2001-05-31 00:30:39 by kkm]
kkm
parents: 563
diff changeset
7036 int preempted = redisplay_frame (f, 1);
545
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7037 if (preempted)
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7038 return 1;
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7039 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7040
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7041 /* 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
7042 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
7043 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
7044 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
7045 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
7046 in the right state. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7047 if (f->size_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7048 size_change_failed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7049 }
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 DEVICE_FRAME_LOOP (frmcons, d)
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 f = XFRAME (XCAR (frmcons));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7054
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7055 if (f == XFRAME (DEVICE_SELECTED_FRAME (d)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7056 continue;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7057
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7058 if (f->icon_changed || f->windows_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7059 update_frame_icon (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7060
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7061 if (FRAME_REPAINT_P (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7062 {
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
7063 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7064 {
588
ed8e2ee8d29d [xemacs-hg @ 2001-05-31 00:30:39 by kkm]
kkm
parents: 563
diff changeset
7065 int preempted = redisplay_frame (f, 1);
545
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7066 if (preempted)
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
7067 return 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7068 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7069
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7070 if (f->size_change_pending)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7071 size_change_failed = 1;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7074
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7075 /* If we get here then we redisplayed all of our frames without
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7076 getting preempted so mark ourselves as clean. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7077 CLASS_RESET_CHANGED_FLAGS (d);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7078
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7079 if (!size_change_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7080 d->size_changed = 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 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7083 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7084
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7085 /* Ensure that all windows on all frames on all devices are displaying
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7086 the current contents of their respective buffers. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7087
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7088 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7089 redisplay_without_hooks (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7090 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7091 Lisp_Object devcons, concons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7092 int size_change_failed = 0;
1292
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
7093 PROFILE_DECLARE ();
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
7094
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
7095 PROFILE_RECORD_ENTERING_SECTION (QSin_redisplay);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7096
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7097 if (asynch_device_change_pending)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7098 handle_asynch_device_change ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7099
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7100 if (!GLOBAL_REDISPLAY_FLAGS_CHANGEDP &&
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
7101 !disable_preemption && preemption_count < max_preempts)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7102 goto done;
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 DEVICE_LOOP_NO_BREAK (devcons, concons)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7105 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7106 struct device *d = XDEVICE (XCAR (devcons));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7107 int preempted;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7108
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
7109 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (d))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7110 {
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
7111 preempted = redisplay_device (d, 1);
428
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 if (preempted)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7114 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7115 preemption_count++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7116 RESET_CHANGED_SET_FLAGS;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7117 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7118 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7119
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7120 /* See comment in redisplay_device. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7121 if (d->size_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7122 size_change_failed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7123 }
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 preemption_count = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7126
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7127 /* Mark redisplay as accurate */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7128 GLOBAL_RESET_CHANGED_FLAGS;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7129 RESET_CHANGED_SET_FLAGS;
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 if (faces_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7132 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7133 mark_all_faces_as_clean ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7134 faces_changed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7135 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7136
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7137 if (!size_change_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7138 size_changed = 0;
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 reset_buffer_changes ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7141
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7142 done:
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
7143 #ifdef ERROR_CHECK_DISPLAY
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
7144 sledgehammer_check_redisplay_structs ();
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
7145 #endif /* ERROR_CHECK_DISPLAY */
1292
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
7146
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
7147 PROFILE_RECORD_EXITING_SECTION (QSin_redisplay);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7148 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7149
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
7150 /* 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
7151 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
7152 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
7153 enter_redisplay_critical_section().
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7154
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7155 (#### 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
7156 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
7157 GC there, too.)
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7158 */
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7159
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7160 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7161 redisplay (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7162 {
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7163 run_pre_idle_hook ();
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7164 redisplay_no_pre_idle_hook ();
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7165 }
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7166
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7167 void
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7168 redisplay_no_pre_idle_hook (void)
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7169 {
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7170 if (last_display_warning_tick != display_warning_tick &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7171 !inhibit_warning_display)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7172 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7173 /* 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
7174 If we report another warning, we could get stuck in an
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7175 infinite loop reporting warnings. */
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7176 call0_trapping_problems
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7177 (0, Qdisplay_warning_buffer,
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7178 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7179 last_display_warning_tick = display_warning_tick;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7180 }
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 redisplay_without_hooks ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7183 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7184
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7185 Lisp_Object
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7186 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
7187 {
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7188 return
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7189 eval_in_buffer_trapping_problems
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7190 ("Error calling function within redisplay", current_buffer,
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
7191 dont_trust_this_damn_sucker, 0);
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
7192 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7193
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7194 /* Efficiently determine the window line number, and return a pointer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7195 to its printed representation. Do this regardless of whether
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7196 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
7197 1. If narrowing is in effect, the lines are counted from the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7198 beginning of the visible portion of the buffer. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7199 static char *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7200 window_line_number (struct window *w, int type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7201 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7202 struct device *d = XDEVICE (XFRAME (w->frame)->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7203 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7204 /* Be careful in the order of these tests. The first clause will
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7205 fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7206 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
7207 Charbpos pos =
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7208 ((EQ(DEVICE_SELECTED_FRAME(d), w->frame) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7209 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame(d)))) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7210 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7211 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d )
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7212 ? BUF_PT (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7213 : marker_position (w->pointm[type]));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7214 EMACS_INT line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7215
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7216 line = buffer_line_number (b, pos, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7217
603
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 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
7220
1c880911c386 [xemacs-hg @ 2001-06-01 08:23:09 by martinb]
martinb
parents: 588
diff changeset
7221 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
7222
1c880911c386 [xemacs-hg @ 2001-06-01 08:23:09 by martinb]
martinb
parents: 588
diff changeset
7223 return window_line_number_buf;
1c880911c386 [xemacs-hg @ 2001-06-01 08:23:09 by martinb]
martinb
parents: 588
diff changeset
7224 }
428
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7227
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7228 /* Given a character representing an object in a modeline
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7229 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
7230 `mode_spec_ibyte_string') with the information that object
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7231 represents.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7232
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7233 This function is largely unchanged from previous versions of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7234 redisplay engine.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7235
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7236 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
7237 very early in the device/frame update process! JV
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7238 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7239
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7240 static void
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7241 decode_mode_spec (struct window *w, Ichar spec, int type)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7242 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7243 Lisp_Object obj = Qnil;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7244 const char *str = NULL;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7245 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7246
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7247 Dynarr_reset (mode_spec_ibyte_string);
428
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 switch (spec)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7250 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7251 /* print buffer name */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7252 case 'b':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7253 obj = b->name;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7254 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7255
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7256 /* print visited file name */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7257 case 'f':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7258 obj = b->filename;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7259 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7260
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7261 /* print the current column */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7262 case 'c':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7263 {
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7264 Charbpos pt = (w == XWINDOW (Fselected_window (Qnil)))
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7265 ? BUF_PT (b)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7266 : marker_position (w->pointm[type]);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7267 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
7268 char buf[DECIMAL_PRINT_SIZE (long)];
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7269
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7270 long_to_string (buf, col);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7271
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7272 Dynarr_add_many (mode_spec_ibyte_string,
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7273 (const Ibyte *) buf, strlen (buf));
428
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 goto decode_mode_spec_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7276 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7277 /* print the file coding system */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7278 case 'C':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7279 {
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7280 Lisp_Object codesys = b->buffer_file_coding_system;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7281 /* Be very careful here not to get an error. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7282 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
7283 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7284 codesys = find_coding_system_for_text_file (codesys, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7285 if (CODING_SYSTEMP (codesys))
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7286 obj = XCODING_SYSTEM_MNEMONIC (codesys);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
7287 }
428
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 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7290
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7291 /* print the current line number */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7292 case 'l':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7293 str = window_line_number (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7294 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7295
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7296 /* print value of mode-name (obsolete) */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7297 case 'm':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7298 obj = b->mode_name;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7299 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7300
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7301 /* print hyphen and frame number, if != 1 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7302 case 'N':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7303 #ifdef HAVE_TTY
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7304 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7305 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7306 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
7307 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7308 /* Naughty, naughty */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7309 char * writable_str = alloca_array (char, 10);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7310 sprintf (writable_str, "-%d", f->order_count);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7311 str = writable_str;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7312 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7313 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7314 #endif /* HAVE_TTY */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7315 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7316
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7317 /* print Narrow if appropriate */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7318 case 'n':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7319 if (BUF_BEGV (b) > BUF_BEG (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7320 || BUF_ZV (b) < BUF_Z (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7321 str = " Narrow";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7322 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7323
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7324 /* print %, * or hyphen, if buffer is read-only, modified or neither */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7325 case '*':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7326 str = (!NILP (b->read_only)
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 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7329 ? "*"
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 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7332
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7333 /* 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
7334 read-only but still indicate whether it is modified. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7335 case '+':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7336 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
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 : (!NILP (b->read_only)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7339 ? "%"
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 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7342
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7343 /* #### 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
7344 modeline-format doc string. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7345 /* This differs from %* in that it ignores read-only-ness. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7346 case '&':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7347 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7348 ? "*"
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 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7351
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7352 /* print process status */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7353 case 's':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7354 obj = Fget_buffer_process (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7355 if (NILP (obj))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7356 str = GETTEXT ("no process");
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7357 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7358 obj = Fsymbol_name (Fprocess_status (obj));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7359 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7360
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7361 /* Print name of selected frame. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7362 case 'S':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7363 obj = XFRAME (w->frame)->name;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7364 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7365
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7366 /* indicate TEXT or BINARY */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7367 case 't':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7368 /* #### NT does not use this any more. Now what? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7369 str = "T";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7370 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7371
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7372 /* 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
7373 case 'p':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7374 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7375 Charbpos pos = marker_position (w->start[type]);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7376
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7377 /* This had better be while the desired lines are being done. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7378 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7379 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7380 if (pos <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7381 str = "All";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7382 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7383 str = "Bottom";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7384 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7385 else if (pos <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7386 str = "Top";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7387 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7388 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7389 /* 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
7390 fixed maximum length of 3. But just to be safe... */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7391 char buf[10];
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7392 Charcount chars = pos - BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7393 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7394
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7395 /* Avoid overflow on big buffers */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7396 int percent = total > LONG_MAX/200 ?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7397 (chars + total/200) / (total / 100) :
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7398 (chars * 100 + total/2) / total;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7399
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7400 /* 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
7401 2-digit number that is close. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7402 if (percent == 100)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7403 percent = 99;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7404
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7405 sprintf (buf, "%d%%", percent);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7406 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7407 strlen (buf));
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 goto decode_mode_spec_done;
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 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7412 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7413
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7414 /* print percent of buffer above bottom of window, perhaps plus
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7415 Top, or print Bottom or All */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7416 case 'P':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7417 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7418 Charbpos toppos = marker_position (w->start[type]);
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7419 Charbpos botpos = BUF_Z (b) - w->window_end_pos[type];
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7420
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7421 /* 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
7422 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
7423 botpos may be negative. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7424 if (botpos < toppos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7425 botpos = toppos;
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 (botpos >= BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7428 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7429 if (toppos <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7430 str = "All";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7431 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7432 str = "Bottom";
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7435 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7436 /* 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
7437 fixed maximum length of around 6. But just to be safe... */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7438 char buf[10];
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7439 Charcount chars = botpos - BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7440 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7441
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7442 /* Avoid overflow on big buffers */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7443 int percent = total > LONG_MAX/200 ?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7444 (chars + total/200) / (total / 100) :
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7445 (chars * 100 + total/2) / max (total, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7446
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7447 /* 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
7448 2-digit number that is close. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7449 if (percent == 100)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7450 percent = 99;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7451
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7452 if (toppos <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7453 sprintf (buf, "Top%d%%", percent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7454 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7455 sprintf (buf, "%d%%", percent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7456
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7457 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7458 strlen (buf));
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 goto decode_mode_spec_done;
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 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7463 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7464
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7465 /* print % */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7466 case '%':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7467 str = "%";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7468 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7469
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7470 /* print one [ for each recursive editing level. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7471 case '[':
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 int i;
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 if (command_loop_level > 5)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7476 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7477 str = "[[[... ";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7478 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7479 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7480
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7481 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
7482 Dynarr_add (mode_spec_ibyte_string, '[');
428
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 goto decode_mode_spec_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7485 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7486
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7487 /* print one ] for each recursive editing level. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7488 case ']':
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 int i;
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 if (command_loop_level > 5)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7493 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7494 str = "...]]]";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7495 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7496 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7497
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7498 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
7499 Dynarr_add (mode_spec_ibyte_string, ']');
428
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 goto decode_mode_spec_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7502 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7503
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7504 /* print infinitely many dashes -- handle at top level now */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7505 case '-':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7506 break;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7509
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7510 if (STRINGP (obj))
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7511 Dynarr_add_many (mode_spec_ibyte_string,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7512 XSTRING_DATA (obj),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7513 XSTRING_LENGTH (obj));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7514 else if (str)
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7515 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) str, strlen (str));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7516
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7517 decode_mode_spec_done:
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7518 Dynarr_add (mode_spec_ibyte_string, '\0');
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7519 }
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 /* Given a display line, free all of its data structures. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7522
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7523 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7524 free_display_line (struct display_line *dl)
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 int block;
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 if (dl->display_blocks)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7529 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7530 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
7531 {
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7532 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
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 Dynarr_free (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7535 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7536
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7537 Dynarr_free (dl->display_blocks);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7538 dl->display_blocks = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7539 }
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 if (dl->left_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7542 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7543 Dynarr_free (dl->left_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7544 dl->left_glyphs = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7545 }
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 if (dl->right_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7548 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7549 Dynarr_free (dl->right_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7550 dl->right_glyphs = NULL;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7554
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7555 /* Given an array of display lines, free them and all data structures
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7556 contained within them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7557
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7558 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7559 free_display_lines (display_line_dynarr *dla)
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 int 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 for (line = 0; line < Dynarr_largest (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 free_display_line (Dynarr_atp (dla, line));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7566 }
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 Dynarr_free (dla);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7569 }
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 /* Call internal free routine for each set of display lines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7572
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7573 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7574 free_display_structs (struct window_mirror *mir)
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 if (mir->current_display_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7577 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7578 free_display_lines (mir->current_display_lines);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7579 mir->current_display_lines = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7580 }
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 if (mir->desired_display_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7583 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7584 free_display_lines (mir->desired_display_lines);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7585 mir->desired_display_lines = 0;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7589
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7590 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7591 mark_glyph_block_dynarr (glyph_block_dynarr *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 if (gba)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7594 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7595 glyph_block *gb = Dynarr_atp (gba, 0);
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
7596 glyph_block *gb_last = Dynarr_past_lastp (gba);
428
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 for (; gb < gb_last; gb++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7599 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7600 if (!NILP (gb->glyph))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7601 mark_object (gb->glyph);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7602 if (!NILP (gb->extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7603 mark_object (gb->extent);
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7606 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7607
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7608 /* 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
7609 the glyph will also mark the image_instance. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7610 void
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7611 mark_redisplay_structs (display_line_dynarr *dla)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7612 {
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
7613 display_line *dl = Dynarr_begin (dla);
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
7614 display_line *dl_last = Dynarr_past_lastp (dla);
428
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 for (; dl < dl_last; dl++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7617 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7618 display_block_dynarr *dba = dl->display_blocks;
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
7619 display_block *db = Dynarr_begin (dba);
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
7620 display_block *db_last = Dynarr_past_lastp (dba);
428
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 for (; db < db_last; db++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7623 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7624 rune_dynarr *ra = db->runes;
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
7625 rune *r = Dynarr_begin (ra);
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
7626 rune *r_last = Dynarr_past_lastp (ra);
428
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 for (; r < r_last; r++)
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 (r->type == RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7631 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7632 if (!NILP (r->object.dglyph.glyph))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7633 mark_object (r->object.dglyph.glyph);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7634 if (!NILP (r->object.dglyph.extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7635 mark_object (r->object.dglyph.extent);
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7639
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7640 mark_glyph_block_dynarr (dl->left_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7641 mark_glyph_block_dynarr (dl->right_glyphs);
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7644
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7645
2367
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 /*
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 on line-start cache:
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
7650
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
7651 (Info-goto-node "(internals)Line Start Cache")
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
7652 */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7653
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7654 /* 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
7655 allocating and freeing it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7656 static line_start_cache_dynarr *internal_cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7657
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7658 /* Makes internal_cache represent the TYPE display structs and only
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7659 the TYPE display structs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7660
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7661 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7662 update_internal_cache_list (struct window *w, int type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7663 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7664 int line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7665 display_line_dynarr *dla = window_display_lines (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7666
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7667 Dynarr_reset (internal_cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7668 for (line = 0; line < Dynarr_length (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 struct display_line *dl = Dynarr_atp (dla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7671
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7672 if (dl->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7673 continue;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7674 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7675 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7676 struct line_start_cache lsc;
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
7677
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
7678 lsc.start = dl->charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
7679 lsc.end = dl->end_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7680 lsc.height = dl->ascent + dl->descent;
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 Dynarr_add (internal_cache, lsc);
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7686
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7687 /* Reset the line cache if necessary. This should be run at the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7688 beginning of any function which access the cache. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7689
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7690 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7691 validate_line_start_cache (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7692 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7693 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7694 struct frame *f = XFRAME (w->frame);
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 if (!w->line_cache_validation_override)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7697 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7698 /* 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
7699 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
7700 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
7701 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
7702 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
7703 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
7704 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
7705 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
7706 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
7707 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
7708 dragging out regions with the mouse. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7709 if (XINT (w->line_cache_last_updated) < BUF_MODIFF (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7710 || f->faces_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7711 || f->clip_changed)
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 Dynarr_reset (w->line_start_cache);
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7717
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7718 /* Return the very first buffer position contained in the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7719 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
7720 cache is valid. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7721
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7722 static Charbpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7723 line_start_cache_start (struct window *w)
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 line_start_cache_dynarr *cache = w->line_start_cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7726
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7727 if (!Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7728 return -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7729 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7730 return Dynarr_atp (cache, 0)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7731 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7732
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7733 /* Return the very last buffer position contained in the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7734 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
7735 cache is valid. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7736
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7737 static Charbpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7738 line_start_cache_end (struct window *w)
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 line_start_cache_dynarr *cache = w->line_start_cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7741
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7742 if (!Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7743 return -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7744 else
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
7745 return Dynarr_lastp (cache)->end;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7746 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7747
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7748 /* Return the index of the line POINT is contained within in window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7749 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
7750 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
7751 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
7752 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
7753 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
7754 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
7755 for any reason. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7756
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7757 int
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7758 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
7759 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7760 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7761 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
7762 int top, bottom, pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7763
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7764 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7765 w->line_cache_validation_override++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7766
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7767 /* Let functions pass in negative values, but we still treat -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7768 specially. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7769 /* #### bogosity alert */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7770 if (min_past < 0 && min_past != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7771 min_past = -min_past;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7772
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7773 if (!Dynarr_length (cache) || line_start_cache_start (w) > point
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7774 || line_start_cache_end (w) < point)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7775 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7776 int loop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7777 int win_char_height = window_char_height (w, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7778
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7779 /* 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
7780 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
7781 count of 0 so handle that case. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7782 if (!win_char_height)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7783 win_char_height = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7784
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7785 if (!Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7786 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7787 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
7788 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
7789
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7790 update_line_start_cache (w, from, to, point, 0);
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 if (!Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7793 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7794 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7795 return -1;
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 }
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 assert (Dynarr_length (cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7800
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7801 loop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7802 while (line_start_cache_start (w) > point
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7803 && (loop < cache_adjustment || min_past == -1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7804 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7805 Charbpos from, to;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7806
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7807 from = line_start_cache_start (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7808 if (from <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7809 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7810
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7811 from = find_next_newline_no_quit (b, from, -win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7812 to = line_start_cache_end (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7813
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7814 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7815 loop++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7816 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7817
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7818 if (line_start_cache_start (w) > point)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7819 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7820 Charbpos from, to;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7821
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7822 from = find_next_newline_no_quit (b, point, -1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7823 if (from >= BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7824 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7825 to = find_next_newline_no_quit (b, from, -win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7826 from = to;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7827 to = BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7828 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7829 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7830 to = find_next_newline_no_quit (b, from, win_char_height);
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 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7833 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7834
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7835 loop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7836 while (line_start_cache_end (w) < point
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7837 && (loop < cache_adjustment || min_past == -1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7838 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7839 Charbpos from, to;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7840
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7841 to = line_start_cache_end (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7842 if (to >= BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7843 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7844
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7845 from = line_start_cache_end (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7846 to = find_next_newline_no_quit (b, from, win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7847
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7848 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7849 loop++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7850 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7851
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7852 if (line_start_cache_end (w) < point)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7853 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7854 Charbpos from, to;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7855
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7856 from = find_next_newline_no_quit (b, point, -1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7857 if (from >= BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7858 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7859 to = find_next_newline_no_quit (b, from, -win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7860 from = to;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7861 to = BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7862 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7863 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7864 to = find_next_newline_no_quit (b, from, win_char_height);
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 update_line_start_cache (w, from, to, point, 0);
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 }
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 assert (Dynarr_length (cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7871
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7872 if (min_past == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7873 min_past = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7874
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7875 /* This could happen if the buffer is narrowed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7876 if (line_start_cache_start (w) > point
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7877 || line_start_cache_end (w) < point)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7878 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7879 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7880 return -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7881 }
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 find_point_loop:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7884
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7885 top = Dynarr_length (cache) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7886 bottom = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7887
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7888 while (1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7889 {
647
b39c14581166 [xemacs-hg @ 2001-08-13 04:45:47 by ben]
ben
parents: 638
diff changeset
7890 int new_pos;
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7891 Charbpos start, end;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7892
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7893 pos = (bottom + top + 1) >> 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7894 start = Dynarr_atp (cache, pos)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7895 end = Dynarr_atp (cache, pos)->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 (point >= start && point <= end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7898 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7899 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7900 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7901 Charbpos from =
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7902 find_next_newline_no_quit (b, line_start_cache_start (w),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7903 -min_past - 1);
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7904 Charbpos to = line_start_cache_end (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7905
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7906 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7907 goto find_point_loop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7908 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7909 else if ((Dynarr_length (cache) - pos - 1) < min_past
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7910 && line_start_cache_end (w) < BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7911 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7912 Charbpos from = line_start_cache_end (w);
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7913 Charbpos to = find_next_newline_no_quit (b, from,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7914 (min_past
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7915 ? min_past
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7916 : 1));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7917
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7918 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7919 goto find_point_loop;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7922 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7923 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7924 return pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7925 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7926 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7927 else if (point > end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7928 bottom = pos + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7929 else if (point < start)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7930 top = pos - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7931 else
2500
3d8143fc88e1 [xemacs-hg @ 2005-01-24 23:33:30 by ben]
ben
parents: 2367
diff changeset
7932 ABORT ();
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7933
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7934 new_pos = (bottom + top + 1) >> 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7935 if (pos == new_pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7936 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7937 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7938 return -1;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7942
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7943 /* 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
7944 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
7945 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
7946 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
7947 pixels. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7948 int
1708
a19b0eb5dfc1 [xemacs-hg @ 2003-09-22 04:21:42 by james]
james
parents: 1320
diff changeset
7949 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
7950 int partially)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7951 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7952 struct buffer *b = XBUFFER (w->buffer);
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
7953 int pixpos = -WINDOW_TEXT_TOP_CLIP(w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7954 int bottom = WINDOW_TEXT_HEIGHT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7955 int start_elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7956
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7957 /* 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
7958 if (point < startp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7959 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7960
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7961 /* If point or start are not in the accessible buffer range, then
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7962 fail. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7963 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7964 || point < BUF_BEGV (b) || point > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7965 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7966
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7967 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7968 w->line_cache_validation_override++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7969
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7970 start_elt = point_in_line_start_cache (w, startp, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7971 if (start_elt == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7972 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7973 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7974 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7975 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7976
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7977 assert (line_start_cache_start (w) <= startp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7978 && line_start_cache_end (w) >= startp);
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 while (1)
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 int height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7983
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7984 /* Expand the cache if necessary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7985 if (start_elt == Dynarr_length (w->line_start_cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7986 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7987 Charbpos old_startp =
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7988 Dynarr_atp (w->line_start_cache, start_elt - 1)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7989
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7990 start_elt = point_in_line_start_cache (w, old_startp,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7991 window_char_height (w, 0));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7992
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7993 /* 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
7994 immediately. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7995 start_elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7996
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7997 /* If this happens we didn't add any extra elements. Bummer. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7998 if (start_elt == Dynarr_length (w->line_start_cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7999 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8000 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8001 return 0;
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 }
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 height = Dynarr_atp (w->line_start_cache, start_elt)->height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8006
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8007 if (pixpos + height > bottom)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8008 {
1708
a19b0eb5dfc1 [xemacs-hg @ 2003-09-22 04:21:42 by james]
james
parents: 1320
diff changeset
8009 if (bottom - pixpos < (partially ? 0 : VERTICAL_CLIP (w, 0)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8010 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8011 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8012 return 0;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8015
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8016 pixpos += height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8017 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8018 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8019 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8020 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8021 }
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 start_elt++;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8026
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8027 /* 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
8028 the buffer position at the beginning or end of the last line
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8029 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
8030 position.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8031
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8032 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
8033 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
8034 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
8035 need to compute its location in a window. That code (in
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8036 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
8037
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8038 #### With a little work this could probably be reworked as just a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8039 call to start_with_line_at_pixpos. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8040
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8041 static Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8042 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
8043 int may_error)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8044 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8045 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8046 line_start_cache_dynarr *cache = w->line_start_cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8047 int pixpos = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8048 int bottom = WINDOW_TEXT_HEIGHT (w);
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8049 Charbpos cur_start;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8050 int start_elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8051
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8052 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8053 w->line_cache_validation_override++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8054
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8055 if (startp < BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8056 startp = BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8057 else if (startp > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8058 startp = BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8059 cur_start = startp;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8060
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8061 start_elt = point_in_line_start_cache (w, cur_start, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8062 if (start_elt == -1)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8063 return may_error ? 0 : startp;
428
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 while (1)
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 int height = Dynarr_atp (cache, start_elt)->height;
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 cur_start = Dynarr_atp (cache, start_elt)->start;
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 if (pixpos + height > bottom)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8072 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8073 /* Adjust for any possible clip. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8074 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8075 start_elt--;
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 if (start_elt < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8078 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8079 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8080 if (end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8081 return BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8082 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8083 return BUF_BEGV (b);
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8086 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8087 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8088 if (end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8089 return Dynarr_atp (cache, start_elt)->end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8090 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8091 return Dynarr_atp (cache, start_elt)->start;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8094
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8095 pixpos += height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8096 start_elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8097 if (start_elt == Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8098 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8099 Charbpos from = line_start_cache_end (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8100 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
8101 Charbpos to = find_next_newline_no_quit (b, from,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8102 (win_char_height
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8103 ? win_char_height
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8104 : 1));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8105
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8106 /* 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
8107 if (from >= BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8108 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8109 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8110 return BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8111 }
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 update_line_start_cache (w, from, to, BUF_PT (b), 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8114
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8115 /* Updating the cache invalidates any current indexes. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8116 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8120
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8121 /* 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
8122 the buffer position at the beginning of the last line displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8123
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8124 Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8125 start_of_last_line (struct window *w, Charbpos startp)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8126 {
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8127 return start_end_of_last_line (w, startp, 0 , 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8128 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8129
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8130 /* 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
8131 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
8132 also know as the window end position. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8133
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8134 Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8135 end_of_last_line (struct window *w, Charbpos startp)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8136 {
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8137 return start_end_of_last_line (w, startp, 1, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8138 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8139
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8140 static Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8141 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
8142 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8143 return start_end_of_last_line (w, startp, 1, 1);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8144 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8145
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8146
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8147 /* 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
8148 the line containing POINT will cover pixel position PIXPOS. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8149
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8150 Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8151 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
8152 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8153 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8154 int cur_elt;
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8155 Charbpos cur_pos, prev_pos = point;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8156 int point_line_height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8157 int pixheight = pixpos - WINDOW_TEXT_TOP (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8158
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8159 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8160 w->line_cache_validation_override++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8161
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8162 cur_elt = point_in_line_start_cache (w, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8163 /* #### See comment in update_line_start_cache about big minibuffers. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8164 if (cur_elt < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8165 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8166 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8167 return point;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8168 }
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 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height;
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 while (1)
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 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start;
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 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8177
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8178 /* 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
8179 That is the responsibility of the calling functions. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8180 if (pixheight < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8181 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8182 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8183 if (-pixheight > point_line_height)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8184 /* We can't make the target line cover pixpos, so put it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8185 above pixpos. That way it will at least be visible. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8186 return prev_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8187 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8188 return cur_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8189 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8190
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8191 cur_elt--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8192 while (cur_elt < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8193 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8194 Charbpos from, to;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8195 int win_char_height;
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 if (cur_pos <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8198 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8199 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8200 return BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8201 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8202
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8203 win_char_height = window_char_height (w, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8204 if (!win_char_height)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8205 win_char_height = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8206
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8207 from = find_next_newline_no_quit (b, cur_pos, -win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8208 to = line_start_cache_end (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8209 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8210
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8211 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8212 assert (cur_elt >= -1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8213 /* This used to be cur_elt>=0 under the assumption that if
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8214 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
8215 setting the window_start to a newline before the start of
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8216 the first line will always cause scrolling.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8217
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8218 However in my (jv) opinion this is wrong. That new line
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8219 can be hidden in various ways: invisible extents, an
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8220 explicit window-start not at a newline character etc.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8221 The existence of those are indeed known to create crashes
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8222 on that assert. So we have no option but to continue the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8223 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
8224 again. */
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
8225 cur_pos = Dynarr_atp (w->line_start_cache,0)->start;
428
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 prev_pos = cur_pos;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8230
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8231 /* 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
8232 the line containing point is on display line LINE. If LINE is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8233 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
8234 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
8235 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
8236 bottom line). */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8237
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8238 Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8239 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
8240 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8241 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8242 w->line_cache_validation_override++;
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 if (line >= 0)
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 int cur_elt = point_in_line_start_cache (w, point, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8247
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8248 if (cur_elt - line < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8249 cur_elt = 0; /* Hit the top */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8250 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8251 cur_elt -= line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8252
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8253 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8254 return Dynarr_atp (w->line_start_cache, cur_elt)->start;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8257 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8258 /* 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
8259 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
8260 because we have already handled one line. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8261 int new_line = -line - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8262 int cur_elt = point_in_line_start_cache (w, point, new_line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8263 int pixpos = WINDOW_TEXT_BOTTOM (w);
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8264 Charbpos retval, search_point;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8265
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8266 /* 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
8267 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
8268 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
8269 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
8270 containing point. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8271 if (scroll_on_clipped_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8272 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8273 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8274 pixpos -= 1;
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 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8277 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8278 /* Hit the bottom of the buffer. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8279 int adjustment =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8280 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8281 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8282 int defheight;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8283
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
8284 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8285 default_face_height_and_width (window, &defheight, 0);
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 cur_elt = Dynarr_length (w->line_start_cache) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8288
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8289 pixpos -= (adjustment * defheight);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8290 if (pixpos < WINDOW_TEXT_TOP (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8291 pixpos = WINDOW_TEXT_TOP (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8292 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8293 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8294 cur_elt = cur_elt + new_line;
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 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8297
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8298 retval = start_with_line_at_pixpos (w, search_point, pixpos);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8299 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8300 return retval;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8303
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8304 /* This is used to speed up vertical scrolling by caching the known
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8305 buffer starting positions for display lines. This allows the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8306 scrolling routines to avoid costly calls to regenerate_window. If
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8307 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
8308 display structs which are in the given range.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8309
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8310 Note also that the FROM/TO values are minimums. It is possible
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8311 that this function will actually add information outside of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8312 lines containing those positions. This can't hurt but it could
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8313 possibly help.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8314
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8315 #### We currently force the cache to have only 1 contiguous region.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8316 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
8317 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
8318 overhead for too little gain. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8319
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8320 static void
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8321 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
8322 Charbpos point, int no_regen)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8323 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8324 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8325 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
8326 Charbpos low_bound, high_bound;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8327
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8328 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8329 w->line_cache_validation_override++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8330
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8331 if (from < BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8332 from = BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8333 if (to > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8334 to = BUF_ZV (b);
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 if (from > to)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8337 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8338 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8339 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8340 }
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 if (Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8343 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8344 low_bound = line_start_cache_start (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8345 high_bound = line_start_cache_end (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8346
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8347 /* Check to see if the desired range is already in the cache. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8348 if (from >= low_bound && to <= high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8349 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8350 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8351 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8352 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8353
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8354 /* Check to make sure that the desired range is adjacent to the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8355 current cache. If not, invalidate the cache. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8356 if (to < low_bound || from > high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8357 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8358 Dynarr_reset (cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8359 low_bound = high_bound = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8360 }
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 else
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 low_bound = high_bound = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8365 }
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 w->line_cache_last_updated = make_int (BUF_MODIFF (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8368
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8369 /* 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
8370 to follow what's going on by having it separate. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8371 if (no_regen)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8372 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8373 Charbpos start, end;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8374
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8375 update_internal_cache_list (w, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8376 if (!Dynarr_length (internal_cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8377 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8378 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8379 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8380 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8381
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
8382 start = Dynarr_begin (internal_cache)->start;
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
8383 end = Dynarr_lastp (internal_cache)->end;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8384
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8385 /* 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
8386 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
8387 cache. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8388 if (Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8389 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8390 if (end < low_bound || start > high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8391 Dynarr_reset (cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8392
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8393 /* #### 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
8394 extending a line (the last line)? */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8395 if (Dynarr_length (cache) == 1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8396 && Dynarr_length (internal_cache) == 1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8397 Dynarr_reset (cache);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8400 if (!Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8401 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8402 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8403 Dynarr_length (internal_cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8404 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8405 return;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8408 /* 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
8409 the bounds of the DESIRED structs in the first place. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8410 if (start >= low_bound && end <= high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8411 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8412 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8413 return;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8416 /* 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
8417 the main cache. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8418 if (start < low_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8419 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8420 int ic_elt = Dynarr_length (internal_cache) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8421 while (ic_elt >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8422 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8423 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8424 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8425 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8426 ic_elt--;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8429 if (!(ic_elt >= 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8430 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8431 Dynarr_reset (cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8432 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8433 Dynarr_length (internal_cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8434 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8435 return;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8438 Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8439 ic_elt + 1);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8442 if (end > high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8443 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8444 int ic_elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8445
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8446 while (ic_elt < Dynarr_length (internal_cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8447 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8448 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8449 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8450 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8451 ic_elt++;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8454 if (!(ic_elt < Dynarr_length (internal_cache)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8455 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8456 Dynarr_reset (cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8457 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8458 Dynarr_length (internal_cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8459 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8460 return;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8463 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8464 Dynarr_length (internal_cache) - ic_elt);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8467 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8468 return;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8471 if (!Dynarr_length (cache) || from < low_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8472 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8473 Charbpos startp = find_next_newline_no_quit (b, from, -1);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8474 int marker = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8475 int old_lb = low_bound;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8476
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8477 while (startp < old_lb || low_bound == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8478 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8479 int ic_elt;
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8480 Charbpos new_startp;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8481
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8482 regenerate_window (w, startp, point, CMOTION_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8483 update_internal_cache_list (w, CMOTION_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8484
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8485 /* 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
8486 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
8487 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
8488 assert (Dynarr_length (internal_cache));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8489 assert (startp == Dynarr_atp (internal_cache, 0)->start);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8490
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8491 ic_elt = Dynarr_length (internal_cache) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8492 if (low_bound != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8493 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8494 while (ic_elt >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8495 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8496 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8497 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8498 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8499 ic_elt--;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8502 assert (ic_elt >= 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8503
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8504 new_startp = Dynarr_atp (internal_cache, ic_elt)->end + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8505
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8506 /*
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8507 * Handle invisible text properly:
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8508 * 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
8509 * 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
8510 */
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8511 if (Dynarr_length (cache) &&
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8512 Dynarr_atp (internal_cache, ic_elt)->end ==
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8513 Dynarr_atp (cache, marker)->end)
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8514 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8515 Dynarr_atp (cache, marker)->start
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8516 = Dynarr_atp (internal_cache, ic_elt)->start;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8517 Dynarr_atp (cache, marker)->height
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8518 = Dynarr_atp (internal_cache, ic_elt)->height;
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8519 ic_elt--;
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
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8522 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
8523 {
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8524 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
8525 ic_elt + 1, marker);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8526 marker += (ic_elt + 1);
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
8527 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8528
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8529 if (startp < low_bound || low_bound == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8530 low_bound = startp;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8531 startp = new_startp;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8532 if (startp > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8533 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8534 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8535 return;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8540 assert (Dynarr_length (cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8541 assert (from >= low_bound);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8542
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8543 /* Readjust the high_bound to account for any changes made while
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8544 correcting the low_bound. */
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
8545 high_bound = Dynarr_lastp (cache)->end;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8546
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8547 if (to > high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8548 {
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
8549 Charbpos startp = Dynarr_lastp (cache)->end + 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8550
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8551 do
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8552 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8553 regenerate_window (w, startp, point, CMOTION_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8554 update_internal_cache_list (w, CMOTION_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8555
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8556 /* See comment above about regenerate_window failing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8557 assert (Dynarr_length (internal_cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8558
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8559 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8560 Dynarr_length (internal_cache));
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
8561 high_bound = Dynarr_lastp (cache)->end;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8562 startp = high_bound + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8563 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8564 while (to > high_bound);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8567 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8568 assert (to <= high_bound);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8572 /* Given x and y coordinates in characters, relative to a window,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8573 return the pixel location corresponding to those coordinates. The
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8574 pixel location returned is the center of the given character
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8575 position. The pixel values are generated relative to the window,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8576 not the frame.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8577
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8578 The modeline is considered to be part of the window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8579
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8580 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8581 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
8582 int *pix_x, int *pix_y)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8583 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8584 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8585 int num_disp_lines, modeline;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8586 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8587 int defheight, defwidth;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8588
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
8589 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8590 default_face_height_and_width (window, &defheight, &defwidth);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8591
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8592 /* 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
8593 the window, use the first window line or character position
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8594 instead. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8595 if (char_y < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8596 char_y = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8597 if (char_x < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8598 char_x = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8599
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8600 num_disp_lines = Dynarr_length (dla);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8601 modeline = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8602 if (num_disp_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8603 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8604 if (Dynarr_atp (dla, 0)->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8605 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8606 num_disp_lines--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8607 modeline = 1;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8611 /* First check if the y position intersects the display lines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8612 if (char_y < num_disp_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8613 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8614 struct display_line *dl = Dynarr_atp (dla, char_y + modeline);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8615 struct display_block *db = get_display_block_from_line (dl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8616
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8617 *pix_y = (dl->ypos - dl->ascent +
647
b39c14581166 [xemacs-hg @ 2001-08-13 04:45:47 by ben]
ben
parents: 638
diff changeset
8618 ((dl->ascent + dl->descent - dl->clip) >> 1));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8619
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8620 if (char_x < Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8621 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8622 struct rune *rb = Dynarr_atp (db->runes, char_x);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8623
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8624 *pix_x = rb->xpos + (rb->width >> 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8625 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8626 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8627 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8628 int last_rune = Dynarr_length (db->runes) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8629 struct rune *rb = Dynarr_atp (db->runes, last_rune);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8630
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8631 char_x -= last_rune;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8632
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8633 *pix_x = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8634 *pix_x += ((char_x - 1) * defwidth);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8635 *pix_x += (defwidth >> 1);
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8638 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8639 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8640 /* It didn't intersect, so extrapolate. #### For now, we include the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8641 modeline in this since we don't have true character positions in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8642 it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8643
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8644 if (!Dynarr_length (w->face_cachels))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8645 reset_face_cachels (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8646
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8647 char_y -= num_disp_lines;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8648
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8649 if (Dynarr_length (dla))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8650 {
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
8651 struct display_line *dl = Dynarr_lastp (dla);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8652 *pix_y = dl->ypos + dl->descent - dl->clip;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8653 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8654 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8655 *pix_y = WINDOW_TEXT_TOP (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8656
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8657 *pix_y += (char_y * defheight);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8658 *pix_y += (defheight >> 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8659
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8660 *pix_x = WINDOW_TEXT_LEFT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8661 /* Don't adjust by one because this is still the unadjusted value. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8662 *pix_x += (char_x * defwidth);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8663 *pix_x += (defwidth >> 1);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8666 if (*pix_x > w->pixel_left + w->pixel_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8667 *pix_x = w->pixel_left + w->pixel_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8668 if (*pix_y > w->pixel_top + w->pixel_height)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8669 *pix_y = w->pixel_top + w->pixel_height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8670
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8671 *pix_x -= w->pixel_left;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8672 *pix_y -= w->pixel_top;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8675 /* 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
8676 there and return information about it if there is. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8677
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8678 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8679 get_position_object (struct display_line *dl, Lisp_Object *obj1,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8680 Lisp_Object *obj2, int x_coord, int *low_x_coord,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8681 int *high_x_coord)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8682 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8683 struct display_block *db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8684 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8685 int block =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8686 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8687
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8688 /* We use get_next_display_block to get the actual display block
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8689 that would be displayed at x_coord. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8690
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8691 if (block == NO_BLOCK)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8692 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8693 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8694 db = Dynarr_atp (dl->display_blocks, block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8695
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8696 for (elt = 0; elt < Dynarr_length (db->runes); elt++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8697 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8698 struct rune *rb = Dynarr_atp (db->runes, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8699
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8700 if (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8701 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8702 if (rb->type == RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8703 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8704 *obj1 = rb->object.dglyph.glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8705 *obj2 = rb->object.dglyph.extent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8706 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8707 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8708 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8709 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8710 *obj2 = Qnil;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8713 if (low_x_coord)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8714 *low_x_coord = rb->xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8715 if (high_x_coord)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8716 *high_x_coord = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8717
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8718 return;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8723 #define UPDATE_CACHE_RETURN \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8724 do { \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8725 d->pixel_to_glyph_cache.valid = 1; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8726 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8727 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8728 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8729 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8730 d->pixel_to_glyph_cache.frame = f; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8731 d->pixel_to_glyph_cache.col = *col; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8732 d->pixel_to_glyph_cache.row = *row; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8733 d->pixel_to_glyph_cache.obj_x = *obj_x; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8734 d->pixel_to_glyph_cache.obj_y = *obj_y; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8735 d->pixel_to_glyph_cache.w = *w; \
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8736 d->pixel_to_glyph_cache.charpos = *charpos; \
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8737 d->pixel_to_glyph_cache.closest = *closest; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8738 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8739 d->pixel_to_glyph_cache.obj1 = *obj1; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8740 d->pixel_to_glyph_cache.obj2 = *obj2; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8741 d->pixel_to_glyph_cache.retval = position; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8742 RETURN_SANS_WARNINGS position; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8743 } while (0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8744
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8745 /* Given x and y coordinates in pixels relative to a frame, return
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8746 information about what is located under those coordinates.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8747
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8748 The return value will be one of:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8749
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8750 OVER_TOOLBAR: over one of the 4 frame toolbars
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8751 OVER_MODELINE: over a modeline
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8752 OVER_BORDER: over an internal border
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8753 OVER_NOTHING: over the text area, but not over text
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8754 OVER_OUTSIDE: outside of the frame border
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8755 OVER_TEXT: over text in the text area
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8756
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8757 OBJ1 is one of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8758
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8759 -- a toolbar button
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8760 -- a glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8761 -- 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
8762
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8763 OBJ2 is one of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8764
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8765 -- 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
8766 -- nil otherwise.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8767
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8768 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
8769 equivalent coordinates relative to the upper-left corner of the glyph.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8770
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8771 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
8772 equivalent coordinates relative to the upper-left corner of the character.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8773
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8774 Otherwise, OBJ_X and OBJ_Y are undefined.
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8777 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8778 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
8779 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
8780 struct window **w, Charbpos *charpos,
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8781 Charbpos *closest, Charcount *modeline_closest,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8782 Lisp_Object *obj1, Lisp_Object *obj2)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8783 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8784 struct device *d;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8785 struct pixel_to_glyph_translation_cache *cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8786 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8787 int frm_left, frm_right, frm_top, frm_bottom;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8788 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
8789 int position = OVER_NOTHING;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8790 int device_check_failed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8791 display_line_dynarr *dla;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8792
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8793 /* 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
8794 the middle of being deleted. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8795 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8796 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8797 device_check_failed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8798 d = NULL, cache = NULL; /* Warning suppression */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8799 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8800 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8801 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8802 d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8803 cache = &d->pixel_to_glyph_cache;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8806 if (!device_check_failed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8807 && cache->valid
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8808 && cache->frame == f
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8809 && cache->low_x_coord <= x_coord
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8810 && cache->high_x_coord > x_coord
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8811 && cache->low_y_coord <= y_coord
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8812 && cache->high_y_coord > y_coord)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8813 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8814 *col = cache->col;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8815 *row = cache->row;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8816 *obj_x = cache->obj_x;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8817 *obj_y = cache->obj_y;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8818 *w = cache->w;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8819 *charpos = cache->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8820 *closest = cache->closest;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8821 *modeline_closest = cache->modeline_closest;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8822 *obj1 = cache->obj1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8823 *obj2 = cache->obj2;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8824
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8825 return cache->retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8826 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8827 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8828 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8829 *col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8830 *row = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8831 *obj_x = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8832 *obj_y = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8833 *w = 0;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8834 *charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8835 *closest = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8836 *modeline_closest = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8837 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8838 *obj2 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8839
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8840 low_x_coord = x_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8841 high_x_coord = x_coord + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8842 low_y_coord = y_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8843 high_y_coord = y_coord + 1;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8846 if (device_check_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8847 return OVER_NOTHING;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8848
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8849 frm_left = FRAME_LEFT_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8850 frm_right = FRAME_RIGHT_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8851 frm_top = FRAME_TOP_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8852 frm_bottom = FRAME_BOTTOM_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8853
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8854 /* 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
8855 redisplay. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8856 if (y_coord < frm_top)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8857 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8858 if (y_coord >= FRAME_TOP_BORDER_START (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8859 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8860 low_y_coord = FRAME_TOP_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8861 high_y_coord = frm_top;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8862 position = OVER_BORDER;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8863 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8864 else if (y_coord >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8865 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8866 low_y_coord = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8867 high_y_coord = FRAME_TOP_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8868 position = OVER_TOOLBAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8869 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8870 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8871 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8872 low_y_coord = y_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8873 high_y_coord = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8874 position = OVER_OUTSIDE;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8877 else if (y_coord >= frm_bottom)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8878 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8879 if (y_coord < FRAME_BOTTOM_BORDER_END (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8880 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8881 low_y_coord = frm_bottom;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8882 high_y_coord = FRAME_BOTTOM_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8883 position = OVER_BORDER;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8884 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8885 else if (y_coord < FRAME_PIXHEIGHT (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8886 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8887 low_y_coord = FRAME_BOTTOM_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8888 high_y_coord = FRAME_PIXHEIGHT (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8889 position = OVER_TOOLBAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8890 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8891 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8892 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8893 low_y_coord = FRAME_PIXHEIGHT (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8894 high_y_coord = y_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8895 position = OVER_OUTSIDE;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8899 if (position != OVER_TOOLBAR && position != OVER_BORDER)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8900 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8901 if (x_coord < frm_left)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8902 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8903 if (x_coord >= FRAME_LEFT_BORDER_START (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8904 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8905 low_x_coord = FRAME_LEFT_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8906 high_x_coord = frm_left;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8907 position = OVER_BORDER;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8908 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8909 else if (x_coord >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8910 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8911 low_x_coord = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8912 high_x_coord = FRAME_LEFT_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8913 position = OVER_TOOLBAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8914 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8915 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8916 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8917 low_x_coord = x_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8918 high_x_coord = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8919 position = OVER_OUTSIDE;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8922 else if (x_coord >= frm_right)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8923 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8924 if (x_coord < FRAME_RIGHT_BORDER_END (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8925 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8926 low_x_coord = frm_right;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8927 high_x_coord = FRAME_RIGHT_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8928 position = OVER_BORDER;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8929 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8930 else if (x_coord < FRAME_PIXWIDTH (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8931 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8932 low_x_coord = FRAME_RIGHT_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8933 high_x_coord = FRAME_PIXWIDTH (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8934 position = OVER_TOOLBAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8935 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8936 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8937 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8938 low_x_coord = FRAME_PIXWIDTH (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8939 high_x_coord = x_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8940 position = OVER_OUTSIDE;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8945 #ifdef HAVE_TOOLBARS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8946 if (position == OVER_TOOLBAR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8947 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8948 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8949 *obj2 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8950 *w = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8951 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8952 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8953 #endif /* HAVE_TOOLBARS */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8954
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8955 /* 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
8956 relative y position even if it is outside the x boundary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8957 if (x_coord < frm_left)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8958 x_coord = frm_left;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8959 else if (x_coord > frm_right)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8960 x_coord = frm_right;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8961
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8962 /* Same in reverse. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8963 if (y_coord < frm_top)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8964 y_coord = frm_top;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8965 else if (y_coord > frm_bottom)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8966 y_coord = frm_bottom;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8967
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8968 /* Find what window the given coordinates are actually in. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8969 window = f->root_window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8970 *w = find_window_by_pixel_pos (x_coord, y_coord, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8971
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8972 /* If we didn't find a window, we're done. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8973 if (!*w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8974 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8975 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8976 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8977 else if (position != OVER_NOTHING)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8978 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8979 *closest = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8980 *modeline_closest = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8981
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8982 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8983 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8984 *w = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8985 UPDATE_CACHE_RETURN;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8989 /* Check if the window is a minibuffer but isn't active. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8990 if (MINI_WINDOW_P (*w) && !minibuf_level)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8991 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8992 /* 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
8993 the return value if it is set. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8994 *w = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8995 UPDATE_CACHE_RETURN;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8998 /* See if the point is over window vertical divider */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8999 if (window_needs_vertical_divider (*w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9000 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9001 int div_x_high = WINDOW_RIGHT (*w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9002 int div_x_low = div_x_high - window_divider_width (*w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9003 int div_y_high = WINDOW_BOTTOM (*w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9004 int div_y_low = WINDOW_TOP (*w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9005
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9006 if (div_x_low < x_coord && x_coord <= div_x_high &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9007 div_y_low < y_coord && y_coord <= div_y_high)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9008 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9009 low_x_coord = div_x_low;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9010 high_x_coord = div_x_high;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9011 low_y_coord = div_y_low;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9012 high_y_coord = div_y_high;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9013 position = OVER_V_DIVIDER;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9014 UPDATE_CACHE_RETURN;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9018 dla = window_display_lines (*w, CURRENT_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9019
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9020 for (*row = 0; *row < Dynarr_length (dla); (*row)++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9021 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9022 int really_over_nothing = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9023 struct display_line *dl = Dynarr_atp (dla, *row);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9024
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9025 if ((int) (dl->ypos - dl->ascent) <= y_coord
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9026 && y_coord <= (int) (dl->ypos + dl->descent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9027 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9028 int check_margin_glyphs = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9029 struct display_block *db = get_display_block_from_line (dl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9030 struct rune *rb = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9031
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9032 if (x_coord < dl->bounds.left_white
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9033 || x_coord >= dl->bounds.right_white)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9034 check_margin_glyphs = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9035
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9036 low_y_coord = dl->ypos - dl->ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9037 high_y_coord = dl->ypos + dl->descent + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9038
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9039 if (position == OVER_BORDER
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9040 || position == OVER_OUTSIDE
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9041 || check_margin_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9042 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9043 int x_check, left_bound;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9044
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9045 if (check_margin_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9046 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9047 x_check = x_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9048 left_bound = dl->bounds.left_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9049 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9050 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9051 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9052 x_check = high_x_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9053 left_bound = frm_left;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9056 if (Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9057 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9058 if (x_check <= left_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9059 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9060 if (dl->modeline)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9061 *modeline_closest = Dynarr_atp (db->runes, 0)->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9062 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9063 *closest = Dynarr_atp (db->runes, 0)->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9064 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9065 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9066 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9067 if (dl->modeline)
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
9068 *modeline_closest = Dynarr_lastp (db->runes)->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9069 else
4844
91b3d00e717f Various cleanups for Dynarr code, from Unicode-internal ws
Ben Wing <ben@xemacs.org>
parents: 4815
diff changeset
9070 *closest = Dynarr_lastp (db->runes)->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9071 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9072
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9073 if (dl->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9074 *modeline_closest += dl->offset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9075 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9076 *closest += dl->offset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9077 }
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 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9080 /* #### What should be here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9081 if (dl->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9082 *modeline_closest = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9083 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9084 *closest = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9085 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9086
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9087 if (check_margin_glyphs)
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 if (x_coord < dl->bounds.left_in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9090 || x_coord >= dl->bounds.right_in)
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 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
9093 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
9094 to accomplish anything. So we go ahead and
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
9095 set what information we can right here and
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
9096 return. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9097 (*row)--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9098 *obj_y = y_coord - (dl->ypos - dl->ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9099 get_position_object (dl, obj1, obj2, x_coord,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9100 &low_x_coord, &high_x_coord);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9101
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9102 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9103 }
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9106 UPDATE_CACHE_RETURN;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9109 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++)
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 int past_end = (*col == Dynarr_length (db->runes));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9112
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9113 if (!past_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9114 rb = Dynarr_atp (db->runes, *col);
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->xpos <= x_coord && x_coord < rb->xpos + rb->width))
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 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9121 (*col)--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9122 rb = Dynarr_atp (db->runes, *col);
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
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9125 *charpos = rb->charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9126 low_x_coord = rb->xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9127 high_x_coord = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9128
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9129 if (rb->type == RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9130 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9131 int elt = *col + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9132
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9133 /* Find the first character after the glyph. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9134 while (elt < Dynarr_length (db->runes))
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 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9137 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9138 if (dl->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9139 *modeline_closest =
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9140 (Dynarr_atp (db->runes, elt)->charpos +
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9141 dl->offset);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9142 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9143 *closest =
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9144 (Dynarr_atp (db->runes, elt)->charpos +
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9145 dl->offset);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9146 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9147 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9148
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9149 elt++;
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 /* 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
9153 character so we return the last position
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
9154 displayed on the line. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9155 if (elt == Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9156 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9157 if (dl->modeline)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9158 *modeline_closest = dl->end_charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9159 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9160 *closest = dl->end_charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9161 really_over_nothing = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9162 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9163 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9164 else
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 if (dl->modeline)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9167 *modeline_closest = rb->charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9168 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9169 *closest = rb->charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9170 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9171
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9172 if (dl->modeline)
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 *row = window_displayed_height (*w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9175
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9176 if (position == OVER_NOTHING)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9177 position = OVER_MODELINE;
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 (rb->type == RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9180 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9181 *obj1 = rb->object.dglyph.glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9182 *obj2 = rb->object.dglyph.extent;
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 else if (rb->type == RUNE_CHAR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9185 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9186 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9187 *obj2 = Qnil;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9190 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9191 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9192 *obj2 = Qnil;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9195 UPDATE_CACHE_RETURN;
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 else if (past_end
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9198 || (rb->type == RUNE_CHAR
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9199 && rb->object.chr.ch == '\n'))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9200 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9201 (*row)--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9202 /* 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
9203 inside margin. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9204 if (check_margin_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9205 get_position_object (dl, obj1, obj2, x_coord,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9206 &low_x_coord, &high_x_coord);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9207 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9208 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9209 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9210 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9211 (*row)--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9212 if (rb->type == RUNE_DGLYPH)
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 *obj1 = rb->object.dglyph.glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9215 *obj2 = rb->object.dglyph.extent;
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 else if (rb->type == RUNE_CHAR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9218 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9219 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9220 *obj2 = Qnil;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9223 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9224 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9225 *obj2 = Qnil;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9228 *obj_x = x_coord - rb->xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9229 *obj_y = y_coord - (dl->ypos - dl->ascent);
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 /* 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
9232 inside margin. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9233 if (check_margin_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9234 get_position_object (dl, obj1, obj2, x_coord, 0, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9235
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9236 if (position == OVER_NOTHING && !really_over_nothing)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9237 position = OVER_TEXT;
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 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9240 }
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 }
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 *row = Dynarr_length (dla) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9247 if (FRAME_WIN_P (f))
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 int bot_elt = Dynarr_length (dla) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9250
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9251 if (bot_elt >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9252 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9253 struct display_line *dl = Dynarr_atp (dla, bot_elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9254 int adj_area = y_coord - (dl->ypos + dl->descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9255 Lisp_Object lwin;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9256 int defheight;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9257
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
9258 lwin = wrap_window (*w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9259 default_face_height_and_width (lwin, 0, &defheight);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9260
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9261 *row += (adj_area / defheight);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9262 }
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9265 /* #### This should be checked out some more to determine what
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9266 should really be going on. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9267 if (!MARKERP ((*w)->start[CURRENT_DISP]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9268 *closest = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9269 else
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9270 *closest = end_of_last_line_may_error (*w,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9271 marker_position ((*w)->start[CURRENT_DISP]));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9272 *col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9273 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9274 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9275 #undef UPDATE_CACHE_RETURN
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9276
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 /***************************************************************************/
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 /* Lisp functions */
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9284 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9285 Ensure that all minibuffers are correctly showing the echo area.
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 ())
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9288 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9289 Lisp_Object devcons, concons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9290
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
9291 if (in_display)
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
9292 return Qnil;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
9293
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9294 DEVICE_LOOP_NO_BREAK (devcons, concons)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9295 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9296 struct device *d = XDEVICE (XCAR (devcons));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9297 Lisp_Object frmcons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9298
1279
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9299 if (DEVICE_STREAM_P (d))
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9300 continue;
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9301
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9302 DEVICE_FRAME_LOOP (frmcons, d)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9303 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9304 struct frame *f = XFRAME (XCAR (frmcons));
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9305 int depth;
428
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 if (FRAME_REPAINT_P (f) && FRAME_HAS_MINIBUF_P (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9308 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9309 Lisp_Object window = FRAME_MINIBUF_WINDOW (f);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9310
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9311 MAYBE_DEVMETH (d, frame_output_begin, (f));
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9312
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9313 /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9314 * If the frame size has changed, there may be random
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9315 * chud on the screen left from previous messages
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9316 * because redisplay_frame hasn't been called yet.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9317 * Clear the screen to get rid of the potential mess.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9318 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9319 if (f->echo_area_garbaged)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9320 {
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9321 MAYBE_DEVMETH (d, clear_frame, (f));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9322 f->echo_area_garbaged = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9323 }
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9324 depth = enter_redisplay_critical_section ();
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9325 redisplay_window (window, 0);
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9326 exit_redisplay_critical_section (depth);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9327 MAYBE_DEVMETH (d, frame_output_end, (f));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9328 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9329 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9330 }
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 return Qnil;
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 DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9336 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
9337 FRAME defaults to the selected frame if omitted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9338 Normally, redisplay is preempted as normal if input arrives. However,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9339 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
9340 input and is guaranteed to proceed to completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9341 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9342 (frame, no_preempt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9343 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9344 struct frame *f = decode_frame (frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9345 int count = specpdl_depth ();
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 if (!NILP (no_preempt))
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9348 internal_bind_int (&disable_preemption, 1 + disable_preemption);
428
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 f->clear = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9351 redisplay_frame (f, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9352
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9353 /* See the comment in Fredisplay_frame. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9354 RESET_CHANGED_SET_FLAGS;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9355
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
9356 return unbind_to (count);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9357 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9358
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9359 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9360 Ensure that FRAME's contents are correctly displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9361 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
9362 be updated, as opposed to unconditionally clearing and redrawing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9363 the frame.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9364 FRAME defaults to the selected frame if omitted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9365 Normally, redisplay is preempted as normal if input arrives. However,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9366 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
9367 input and is guaranteed to proceed to completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9368 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9369 (frame, no_preempt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9370 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9371 struct frame *f = decode_frame (frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9372 int count = specpdl_depth ();
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 if (!NILP (no_preempt))
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9375 internal_bind_int (&disable_preemption, 1 + disable_preemption);
428
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 redisplay_frame (f, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9378
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9379 /* If we don't reset the global redisplay flags here, subsequent
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9380 changes to the display will not get registered by redisplay
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9381 because it thinks it already has registered changes. If you
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9382 really knew what you were doing you could confuse redisplay by
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9383 calling Fredisplay_frame while updating another frame. We assume
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9384 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
9385 stupid. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9386 RESET_CHANGED_SET_FLAGS;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9387
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
9388 return unbind_to (count);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9389 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9390
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9391 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9392 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
9393 DEVICE defaults to the selected device if omitted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9394 Normally, redisplay is preempted as normal if input arrives. However,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9395 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
9396 input and is guaranteed to proceed to completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9397 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9398 (device, no_preempt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9399 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9400 struct device *d = decode_device (device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9401 Lisp_Object frmcons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9402 int count = specpdl_depth ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9403
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9404 if (!NILP (no_preempt))
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9405 internal_bind_int (&disable_preemption, 1 + disable_preemption);
428
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 DEVICE_FRAME_LOOP (frmcons, d)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9408 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9409 XFRAME (XCAR (frmcons))->clear = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9410 }
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9411 redisplay_device (d, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9412
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9413 /* See the comment in Fredisplay_frame. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9414 RESET_CHANGED_SET_FLAGS;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9415
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
9416 return unbind_to (count);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9417 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9418
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9419 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9420 Ensure that DEVICE's contents are correctly displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9421 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
9422 be updated, as opposed to unconditionally clearing and redrawing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9423 the device.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9424 DEVICE defaults to the selected device if omitted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9425 Normally, redisplay is preempted as normal if input arrives. However,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9426 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
9427 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
9428
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9429 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
9430 `(sit-for 0)'.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9431 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9432 (device, no_preempt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9433 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9434 struct device *d = decode_device (device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9435 int count = specpdl_depth ();
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 if (!NILP (no_preempt))
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9438 internal_bind_int (&disable_preemption, 1 + disable_preemption);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9439
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9440 redisplay_device (d, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9441
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9442 /* See the comment in Fredisplay_frame. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9443 RESET_CHANGED_SET_FLAGS;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9444
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
9445 return unbind_to (count);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9446 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9447
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9448 /* Big lie. Big lie. This will force all modelines to be updated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9449 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
9450 solely for backwards compatibility. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9451 DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9452 Force the modeline of the current buffer to be redisplayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9453 With optional non-nil ALL, force redisplay of all modelines.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9454 */
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9455 (UNUSED (all)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9456 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9457 MARK_MODELINE_CHANGED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9458 return Qnil;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9461 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9462 Force an immediate update of the cursor on FRAME.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9463 FRAME defaults to the selected frame if omitted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9464 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9465 (frame))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9466 {
1279
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9467 struct frame *f = decode_frame (frame);
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9468
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9469 if (!FRAME_STREAM_P (f))
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9470 redisplay_redraw_cursor (f, 1);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9471 return Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9472 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9473
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9474
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 /* */
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9477 /* Change flags */
428
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 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9480
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9481 static void
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9482 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
9483 struct frame *UNUSED (f),
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9484 Lisp_Object UNUSED (oldval))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9485 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9486 /* Nothing to be done? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9487 }
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 int
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9490 redisplay_variable_changed (Lisp_Object UNUSED (sym),
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9491 Lisp_Object *UNUSED (val),
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9492 Lisp_Object UNUSED (in_object),
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9493 int UNUSED (flags))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9494 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9495 /* #### clip_changed should really be renamed something like
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9496 global_redisplay_change. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9497 MARK_CLIP_CHANGED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9498 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9499 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9500
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9501 /* This is called if the built-in glyphs have their properties
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9502 changed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9503 void
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9504 redisplay_glyph_changed (Lisp_Object UNUSED (glyph),
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9505 Lisp_Object UNUSED (property), Lisp_Object locale)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9506 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9507 if (WINDOWP (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9508 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9509 MARK_FRAME_GLYPHS_CHANGED (XFRAME (WINDOW_FRAME (XWINDOW (locale))));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9510 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9511 else if (FRAMEP (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9512 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9513 MARK_FRAME_GLYPHS_CHANGED (XFRAME (locale));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9514 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9515 else if (DEVICEP (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9516 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9517 Lisp_Object frmcons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9518 DEVICE_FRAME_LOOP (frmcons, XDEVICE (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9519 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9520 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9521 else if (CONSOLEP (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9522 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9523 Lisp_Object frmcons, devcons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9524 CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, XCONSOLE (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9525 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9526 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9527 else /* global or buffer */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9528 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9529 Lisp_Object frmcons, devcons, concons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9530 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9531 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9532 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9533 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9534
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9535 static void
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9536 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
9537 struct window *w, Lisp_Object UNUSED (oldval))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9538 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9539 if (XFRAME (w->frame)->init_finished)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9540 Fforce_cursor_redisplay (w->frame);
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
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9543 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9544 mark_buffers_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9545 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9546 MARK_TYPE_CHANGED (buffers);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9547 }
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 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9550 mark_clip_changed (void)
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 MARK_TYPE_CHANGED (clip);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9553 }
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 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9556 mark_extents_changed (void)
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 MARK_TYPE_CHANGED (extents);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9559 }
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 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9562 mark_icon_changed (void)
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 MARK_TYPE_CHANGED (icon);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9565 }
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 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9568 mark_menubar_changed (void)
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 MARK_TYPE_CHANGED (menubar);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9571 }
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 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9574 mark_modeline_changed (void)
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 MARK_TYPE_CHANGED (modeline);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9577 }
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 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9580 mark_point_changed (void)
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 MARK_TYPE_CHANGED (point);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9583 }
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 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9586 mark_toolbar_changed (void)
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 MARK_TYPE_CHANGED (toolbar);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9589 }
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 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9592 mark_gutter_changed (void)
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 MARK_TYPE_CHANGED (gutter);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9595 }
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 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9598 mark_glyphs_changed (void)
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 MARK_TYPE_CHANGED (glyphs);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9601 }
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 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9604 mark_subwindows_changed (void)
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 MARK_TYPE_CHANGED (subwindows);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9607 }
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 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9610 mark_subwindows_state_changed (void)
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 MARK_TYPE_CHANGED (subwindows_state);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9613 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9614
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9615 #ifdef MEMORY_USAGE_STATS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9616
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9617
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9618 /***************************************************************************/
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 /* memory usage computation */
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9624 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9625 compute_rune_dynarr_usage (rune_dynarr *dyn, struct overhead_stats *ovstats)
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 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9628 }
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 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9631 compute_display_block_dynarr_usage (display_block_dynarr *dyn,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9632 struct overhead_stats *ovstats)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9633 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9634 int total, i;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9635
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9636 if (!dyn)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9637 return 0;
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 total = Dynarr_memory_usage (dyn, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9640 for (i = 0; i < Dynarr_largest (dyn); i++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9641 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9642
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9643 return total;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9644 }
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 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9647 compute_glyph_block_dynarr_usage (glyph_block_dynarr *dyn,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9648 struct overhead_stats *ovstats)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9649 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9650 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9651 }
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 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9654 compute_display_line_dynarr_usage (display_line_dynarr *dyn,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9655 struct overhead_stats *ovstats)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9656 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9657 int total, i;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9658
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9659 if (!dyn)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9660 return 0;
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 total = Dynarr_memory_usage (dyn, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9663 for (i = 0; i < Dynarr_largest (dyn); i++)
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 struct display_line *dl = &Dynarr_at (dyn, i);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9666 total += compute_display_block_dynarr_usage(dl->display_blocks, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9667 total += compute_glyph_block_dynarr_usage (dl->left_glyphs, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9668 total += compute_glyph_block_dynarr_usage (dl->right_glyphs, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9669 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9670
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9671 return total;
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 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9675 compute_line_start_cache_dynarr_usage (line_start_cache_dynarr *dyn,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9676 struct overhead_stats *ovstats)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9677 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9678 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9679 }
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 #endif /* MEMORY_USAGE_STATS */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9682
1204
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
9683 #ifdef ERROR_CHECK_DISPLAY
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
9684
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9685 static int
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9686 sledgehammer_check_redisplay_structs_1 (struct window *w,
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1726
diff changeset
9687 void *UNUSED (closure))
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9688 {
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9689 int i, j;
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9690 display_line_dynarr *dl;
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 dl = window_display_lines (w, CURRENT_DISP);
4187
26dccfc8fa60 [xemacs-hg @ 2007-09-26 13:27:59 by didierv]
didierv
parents: 3659
diff changeset
9693
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9694 for (i = 0; i < Dynarr_largest (dl); i++)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9695 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
9696 assert (Dynarr_atp (dl, i)->display_blocks !=
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9697 Dynarr_atp (dl, j)->display_blocks);
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9698
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9699 dl = window_display_lines (w, DESIRED_DISP);
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9700
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9701 for (i = 0; i < Dynarr_largest (dl); i++)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9702 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
9703 assert (Dynarr_atp (dl, i)->display_blocks !=
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9704 Dynarr_atp (dl, j)->display_blocks);
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9705
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9706 return 0;
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9707 }
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 static void
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9710 sledgehammer_check_redisplay_structs (void)
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 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
9713 }
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9714
1204
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
9715 #endif /* ERROR_CHECK_DISPLAY */
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
9716
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9717
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9718 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9719 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9720 /* initialization */
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9724 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9725 init_redisplay (void)
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 disable_preemption = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9728 preemption_count = 0;
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 #ifndef PDUMP
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9731 if (!initialized)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9732 #endif
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9733 {
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9734 if (!cmotion_display_lines)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9735 cmotion_display_lines = Dynarr_new (display_line);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
9736 if (!mode_spec_ibyte_string)
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
9737 mode_spec_ibyte_string = Dynarr_new (Ibyte);
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9738 if (!formatted_string_extent_dynarr)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9739 formatted_string_extent_dynarr = Dynarr_new (EXTENT);
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9740 if (!formatted_string_extent_start_dynarr)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9741 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9742 if (!formatted_string_extent_end_dynarr)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9743 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9744 if (!internal_cache)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9745 internal_cache = Dynarr_new (line_start_cache);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9746 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9747
4477
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9748 if (!initialized)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9749 return;
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 (noninteractive)
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9752 {
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9753 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
9754 return;
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
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9757 /* 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
9758 initializing the terminal. This is especially important when the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9759 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
9760 using the window system.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9761
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9762 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
9763 with an error message if that doesn't work. */
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 #ifdef HAVE_X_WINDOWS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9766 if (!strcmp (display_use, "x"))
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 /* Some stuff checks this way early. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9769 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
9770 Vinitial_device_type = Qx;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9771 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9772 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9773 #endif /* HAVE_X_WINDOWS */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9774
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9775 #ifdef HAVE_GTK
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9776 if (!strcmp (display_use, "gtk"))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9777 {
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9778 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
9779 Vinitial_device_type = Qgtk;
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9780 return;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9781 }
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9782 #endif
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9783
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9784 #ifdef HAVE_MS_WINDOWS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9785 if (!strcmp (display_use, "mswindows"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9786 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9787 /* Some stuff checks this way early. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9788 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
9789 Vinitial_device_type = Qmswindows;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9790 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9791 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9792 #endif /* HAVE_MS_WINDOWS */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9793
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9794 #ifdef HAVE_TTY
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9795 /* If no window system has been specified, try to use the terminal. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9796 if (!isatty (0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9797 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9798 stderr_out ("XEmacs: standard input is not a tty\n");
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9799 exit (1);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9802 /* Look at the TERM variable */
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
9803 if (!egetenv ("TERM"))
428
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 stderr_out ("Please set the environment variable TERM; see tset(1).\n");
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9806 exit (1);
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
4477
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9809 Vinitial_device_type = Qtty;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9810 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9811 #else /* not HAVE_TTY */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9812 /* No DISPLAY specified, and no TTY support. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9813 stderr_out ("XEmacs: Cannot open display.\n\
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9814 Please set the environmental variable DISPLAY to an appropriate value.\n");
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9815 exit (1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9816 #endif
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9817 /* Unreached. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9818 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9819
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9820 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9821 syms_of_redisplay (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9822 {
563
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 545
diff changeset
9823 DEFSYMBOL (Qcursor_in_echo_area);
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 545
diff changeset
9824 DEFSYMBOL (Qdisplay_warning_buffer);
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 545
diff changeset
9825 DEFSYMBOL (Qbar_cursor);
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 545
diff changeset
9826 DEFSYMBOL (Qtop_bottom);
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 545
diff changeset
9827 DEFSYMBOL (Qbuffer_list_changed_hook);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9828
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9829 DEFSUBR (Fredisplay_echo_area);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9830 DEFSUBR (Fredraw_frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9831 DEFSUBR (Fredisplay_frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9832 DEFSUBR (Fredraw_device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9833 DEFSUBR (Fredisplay_device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9834 DEFSUBR (Fredraw_modeline);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9835 DEFSUBR (Fforce_cursor_redisplay);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9836 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9837
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9838 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9839 vars_of_redisplay (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9840 {
1292
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
9841 QSin_redisplay = build_msg_string ("(in redisplay)");
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
9842 staticpro (&QSin_redisplay);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9843
1318
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
9844 Vpost_redisplay_actions = Qnil;
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
9845 staticpro (&Vpost_redisplay_actions);
b531bf8658e9 [xemacs-hg @ 2003-02-21 06:56:46 by ben]
ben
parents: 1292
diff changeset
9846
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9847 #if 0
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9848 staticpro (&last_arrow_position);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9849 staticpro (&last_arrow_string);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9850 last_arrow_position = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9851 last_arrow_string = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9852 #endif /* 0 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9853
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9854 /* #### Probably temporary */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9855 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9856 \(Temporary) Setting this will impact the performance of the internal
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9857 line start cache.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9858 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9859 cache_adjustment = 2;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9860
1268
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
9861 DEFVAR_INT ("maximum-preempts", &max_preempts /*
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
9862 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
9863 */ );
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
9864 max_preempts = INIT_MAX_PREEMPTS;
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
9865
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9866 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9867 Minimum pixel height for clipped bottom display line.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9868 A clipped line shorter than this won't be displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9869 */ ,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9870 redisplay_variable_changed);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9871 vertical_clip = 5;
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 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9874 Minimum visible area for clipped glyphs at right boundary.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9875 Clipped glyphs shorter than this won't be displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9876 Only pixmap glyph instances are currently allowed to be clipped.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9877 */ ,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9878 redisplay_variable_changed);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9879 horizontal_clip = 5;
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 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9882 String displayed by modeline-format's "%m" specification.
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 Vglobal_mode_string = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9885
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9886 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9887 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
9888 This must be the beginning of a line in order to work.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9889 See also `overlay-arrow-string'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9890 */ ,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9891 redisplay_variable_changed);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9892 Voverlay_arrow_position = Qnil;
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 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9895 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
9896 \(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
9897 well as a string.)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9898 */ ,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9899 redisplay_variable_changed);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9900 Voverlay_arrow_string = Qnil;
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 DEFVAR_INT ("scroll-step", &scroll_step /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9903 *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
9904 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
9905 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
9906 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9907 scroll_step = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9908
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9909 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9910 *Scroll up to this many lines, to bring point back on screen.
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 scroll_conservatively = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9913
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9914 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9915 &truncate_partial_width_windows /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9916 *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
9917 */ ,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9918 redisplay_variable_changed);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9919 truncate_partial_width_windows = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9920
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9921 DEFVAR_LISP ("visible-bell", &Vvisible_bell /*
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9922 *Non-nil substitutes a visual signal for the audible bell.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9923
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9924 Default behavior is to flash the whole screen. On some platforms,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9925 special effects are available using the following values:
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9926
3025
facf3239ba30 [xemacs-hg @ 2005-10-25 11:16:19 by ben]
ben
parents: 2552
diff changeset
9927 `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
9928 `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
9929
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9930 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
9931 default, whole screen. (Currently only X supports any special effects.)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9932 */ );
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9933 Vvisible_bell = Qnil;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9934
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9935 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9936 *Non-nil means no need to redraw entire frame after suspending.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9937 A non-nil value is useful if the terminal can automatically preserve
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9938 Emacs's frame display when you reenter Emacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9939 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
9940 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9941 no_redraw_on_reenter = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9942
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9943 DEFVAR_LISP ("window-system", &Vwindow_system /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9944 A symbol naming the window-system under which Emacs is running,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9945 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
9946
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9947 Do not use this variable, except for GNU Emacs compatibility, as it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9948 gives wrong values in a multi-device environment. Use `console-type'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9949 instead.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9950 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9951 Vwindow_system = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9952
4477
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9953 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
9954 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
9955
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9956 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
9957 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
9958 */ );
4477
e34711681f30 Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents: 4418
diff changeset
9959 Vinitial_device_type = Qnil;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9960
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9961 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9962 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
9963 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9964 cursor_in_echo_area = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9965
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9966 /* #### Shouldn't this be generalized as follows:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9967
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9968 if nil, use block cursor.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9969 if a number, use a bar cursor of that width.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9970 Otherwise, use a 1-pixel bar cursor.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9971
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9972 #### Or better yet, this variable should be trashed entirely
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9973 (use a Lisp-magic variable to maintain compatibility)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9974 and a specifier `cursor-shape' added, which allows a block
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9975 cursor, a bar cursor, a flashing block or bar cursor,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9976 maybe a caret cursor, etc. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9977
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9978 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /*
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents: 444
diff changeset
9979 *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
9980 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9981 Vbar_cursor = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9982
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9983 DEFVAR_LISP ("buffer-list-changed-hook", &Vbuffer_list_changed_hook /*
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9984 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
9985 This is called during redisplay, before redisplaying each frame.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9986 Functions on this hook are called with one argument, the frame.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9987 */ );
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9988 Vbuffer_list_changed_hook = Qnil;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9989
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9990 DEFVAR_INT ("display-warning-tick", &display_warning_tick /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9991 Bump this to tell the C code to call `display-warning-buffer'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9992 at next redisplay. You should not normally change this; the function
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9993 `display-warning' automatically does this at appropriate times.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9994 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9995 display_warning_tick = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9996
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9997 DEFVAR_BOOL ("inhibit-warning-display", &inhibit_warning_display /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9998 Non-nil means inhibit display of warning messages.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9999 You should *bind* this, not set it. Any pending warning messages
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10000 will be displayed when the binding no longer applies.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10001 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10002 /* reset to 0 by startup.el after the splash screen has displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10003 This way, the warnings don't obliterate the splash screen. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10004 inhibit_warning_display = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10005
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10006 DEFVAR_BOOL ("column-number-start-at-one", &column_number_start_at_one /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10007 *Non-nil means column display number starts at 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 column_number_start_at_one = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10010 }
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 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10013 specifier_vars_of_redisplay (void)
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 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10016 *Width of left margin.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10017 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10018 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10019 Vleft_margin_width = Fmake_specifier (Qnatnum);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10020 set_specifier_fallback (Vleft_margin_width, list1 (Fcons (Qnil, Qzero)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10021 set_specifier_caching (Vleft_margin_width,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10022 offsetof (struct window, left_margin_width),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10023 some_window_value_changed,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10024 offsetof (struct frame, left_margin_width),
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
10025 margin_width_changed_in_frame, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10026
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10027 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10028 *Width of right margin.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10029 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10030 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10031 Vright_margin_width = Fmake_specifier (Qnatnum);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10032 set_specifier_fallback (Vright_margin_width, list1 (Fcons (Qnil, Qzero)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10033 set_specifier_caching (Vright_margin_width,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10034 offsetof (struct window, right_margin_width),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10035 some_window_value_changed,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10036 offsetof (struct frame, right_margin_width),
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
10037 margin_width_changed_in_frame, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10038
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10039 DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10040 *Minimum ascent height of lines.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10041 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10042 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10043 Vminimum_line_ascent = Fmake_specifier (Qnatnum);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10044 set_specifier_fallback (Vminimum_line_ascent, list1 (Fcons (Qnil, Qzero)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10045 set_specifier_caching (Vminimum_line_ascent,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10046 offsetof (struct window, minimum_line_ascent),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10047 some_window_value_changed,
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
10048 0, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10049
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10050 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10051 *Minimum descent height of lines.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10052 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10053 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10054 Vminimum_line_descent = Fmake_specifier (Qnatnum);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10055 set_specifier_fallback (Vminimum_line_descent, list1 (Fcons (Qnil, Qzero)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10056 set_specifier_caching (Vminimum_line_descent,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10057 offsetof (struct window, minimum_line_descent),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10058 some_window_value_changed,
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
10059 0, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10060
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10061 DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10062 *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
10063 displaying `whitespace' or `inside-margin' glyphs.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10064 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10065 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10066 Vuse_left_overflow = Fmake_specifier (Qboolean);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10067 set_specifier_fallback (Vuse_left_overflow, list1 (Fcons (Qnil, Qnil)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10068 set_specifier_caching (Vuse_left_overflow,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10069 offsetof (struct window, use_left_overflow),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10070 some_window_value_changed,
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
10071 0, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10072
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10073 DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10074 *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
10075 displaying `whitespace' or `inside-margin' glyphs.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10076 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10077 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10078 Vuse_right_overflow = Fmake_specifier (Qboolean);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10079 set_specifier_fallback (Vuse_right_overflow, list1 (Fcons (Qnil, Qnil)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10080 set_specifier_caching (Vuse_right_overflow,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10081 offsetof (struct window, use_right_overflow),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10082 some_window_value_changed,
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
10083 0, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10084
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10085 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10086 *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
10087 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10088 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10089 Vtext_cursor_visible_p = Fmake_specifier (Qboolean);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10090 set_specifier_fallback (Vtext_cursor_visible_p, list1 (Fcons (Qnil, Qt)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10091 set_specifier_caching (Vtext_cursor_visible_p,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
10092 offsetof (struct window, text_cursor_visible_p),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10093 text_cursor_visible_p_changed,
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
10094 0, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10095
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10096 }