annotate src/redisplay.c @ 1292:f3437b56874d

[xemacs-hg @ 2003-02-13 09:57:04 by ben] profile updates profile.c: Major reworking. Keep track of new information -- total function timing (includes descendants), GC usage, total GC usage (includes descendants). New functions to be called appropriately from eval.c, alloc.c to keep track of this information. Keep track of when we're actually in a function vs. in its profile, for more accurate timing counts. Track profile overhead separately. Create new mechanism for specifying "internal sections" that are tracked just like regular Lisp functions and even appear in the backtrace if `backtrace-with-internal-sections' is non-nil (t by default for error-checking builds). Add some KKCC information for the straight (non-Elisp) hash table used by profile, which contains Lisp objects in its keys -- but not used yet. Remove old ad-hoc methods for tracking garbage collection, redisplay (which was incorrect anyway when Lisp was called within these sections). Don't record any tick info when blocking under MS Windows, since the timer there is in real time rather than in process time. Make `start-profiling', `stop-profiling' interactive. Be consistent wrt. recursive functions and functions currently on the stack when starting or stopping -- together these make implementing the `total' values extremely difficult. When we start profiling, we act as if we just entered all the functions currently on the stack. Likewise when exiting. Create vars in_profile for tracking time spent inside of profiling, and profiling_lock for setting exclusive access to the main hash table when reading from it or modifying it. (protects against getting screwed up by the signal handle going off at the same time. profile.h: New file. Create macros for declaring internal profiling sections. lisp.h: Move profile-related stuff to profile.h. alloc.c: Keep track of total consing, for profile. Tell profile when we are consing. Use new profile-section method for noting garbage-collection. alloc.c: Abort if we attempt to call the allocator reentrantly. backtrace.h, eval.c: Add info for use by profile in the backtrace frame and transfer PUSH_BACKTRACE/POP_BACKTRACE from eval.c, for use with profile. elhash.c: Author comment. eval.c, lisp.h: New Lisp var `backtrace-with-internal-sections'. Set to t when error-checking is on. eval.c: When unwinding, eval.c: Report to profile when we are about-to-call and just-called wrt. a function. alloc.c, eval.c: Allow for "fake" backtrace frames, for internal sections (used by profile and `backtrace-with-internal-sections'. event-Xt.c, event-gtk.c, event-msw.c, event-tty.c: Record when we are actually blocking on an event, for profile's sake. event-stream.c: Record internal profiling sections for getting, dispatching events. extents.c: Record internal profiling sections for map_extents. hash.c, hash.h: Add pregrow_hash_table_if_necessary(). (Used in profile code since the signal handler is the main grower but can't allow a realloc(). We make sure, at critical points, that the table is large enough.) lread.c: Create internal profiling sections for `load' (which may be triggered internally by autoload, etc.). redisplay.c: Remove old profile_redisplay_flag. Use new macros to declare internal profiling section for redisplay. text.c: Use new macros to declare internal profiling sections for char-byte conversion and internal-external conversion. SEMI-UNRELATED CHANGES: ----------------------- text.c: Update the long comments.
author ben
date Thu, 13 Feb 2003 09:57:08 +0000
parents cd0abfdb9e9d
children b531bf8658e9
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.
1268
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
4 Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003 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
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
41 /* Note: The second rule used to prohibit running Elisp from within redisplay,
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
42 but that's not correct.
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
43
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
44 Use
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
45
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
46 callN_trapping_problems (..., INHIBIT_GC
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
47 | INHIBIT_ANY_CHANGE_AFFECTING_REDISPLAY)
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
48
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
49 instead.
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
50
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
51 --ben
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
52 */
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
53
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
54 #include <config.h>
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
55 #include "lisp.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
56
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
57 #include "buffer.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
58 #include "commands.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
59 #include "debug.h"
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
60 #include "device-impl.h"
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
61 #include "elhash.h"
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
62 #include "events.h"
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
63 #include "extents-impl.h"
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
64 #include "faces.h"
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
65 #include "frame-impl.h"
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
66 #include "glyphs.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
67 #include "gutter.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
68 #include "insdel.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
69 #include "menubar.h"
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
70 #include "objects-impl.h"
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
71 #include "process.h"
1292
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
72 #include "profile.h"
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
73 #include "redisplay.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
74 #include "toolbar.h"
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
75 #include "window-impl.h"
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
76 #include "line-number.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
77 #include "file-coding.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
78
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
79 #include "sysfile.h"
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
80
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
81 #ifdef HAVE_TTY
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
82 #include "console-tty.h"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
83 #endif /* HAVE_TTY */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
84
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
85 /* 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
86 and differentiate between Ibytes and Ichars.
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
87
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
88 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
89 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
90 any contiguous set of Ichars is called an "array". */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
91
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
92 /* 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
93 a rune, but no propagation information needs to be returned. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
94 #define ADD_FAILED (prop_block_dynarr *) 1
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 BEGIN_GLYPHS 0
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
97 #define END_GLYPHS 1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
98 #define LEFT_GLYPHS 2
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
99 #define RIGHT_GLYPHS 3
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 #define VERTICAL_CLIP(w, display) \
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
102 ((WINDOW_TTY_P (w) | (!display && scroll_on_clipped_lines)) \
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
103 ? INT_MAX \
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
104 : vertical_clip)
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 /* The following structures are completely private to redisplay.c so
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
107 we put them here instead of in a header file, for modularity. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
108
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
109 /* NOTE: Bytexpos's not Charxpos's in this structure. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
110
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
111 typedef struct position_redisplay_data_type
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
112 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
113 /* This information is normally filled in by the create_*_block
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
114 routines and is used by the add_*_rune routines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
115 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
116 /* if we are working with strings rather than buffers we need a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
117 handle to the string */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
118 Lisp_Object string;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
119 struct device *d;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
120 struct display_block *db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
121 struct display_line *dl;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
122 Ichar ch; /* Character that is to be added. This is
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
123 used to communicate this information to
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
124 add_ichar_rune(). */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
125 Lisp_Object last_charset; /* The charset of the previous character.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
126 Used to optimize some lookups -- we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
127 only have to do some things when
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
128 the charset changes. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
129 face_index last_findex; /* The face index of the previous character.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
130 Needed to ensure the validity of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
131 last_charset optimization. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
132
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
133 int last_char_width; /* The width of the previous character. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
134 int font_is_bogus; /* If true, it means we couldn't instantiate
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
135 the font for this charset, so we substitute
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
136 ~'s from the ASCII charset. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
137 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
138 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
139 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
140 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
141 when doing anything that references the text in
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
142 the buffer or string. */
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
143 Bytexpos byte_endpos; /* ????? Unknown, under-used. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
144 int pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
145 int max_pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
146 int blank_width; /* Width of the blank that is to be added.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
147 This is used to communicate this information
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
148 to add_blank_rune().
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
149
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
150 This is also used rather cheesily to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
151 communicate the width of the eol-cursor-size
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
152 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
153 add_ichar_rune() is called cheesily with
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
154 the non-printing char '\n', which is stuck
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
155 in the output routines with its width being
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
156 BLANK_WIDTH. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
157 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
158 cursor. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
159 unsigned int cursor_type :3;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
160 int cursor_x; /* rune block cursor is at */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
161 int start_col; /* Number of character columns (each column has
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
162 a width of the default char width) that still
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
163 need to be skipped. This is used for horizontal
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
164 scrolling, where a certain number of columns
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
165 (those off the left side of the screen) need
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
166 to be skipped before anything is displayed. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
167 Bytexpos byte_start_col_enabled;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
168 int start_col_xoffset; /* Number of pixels that still need to
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
169 be skipped. This is used for
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
170 horizontal scrolling of glyphs, where we want
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
171 to be able to scroll over part of the glyph. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
172
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
173 int hscroll_glyph_width_adjust; /* how much the width of the hscroll
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
174 glyph differs from space_width (w).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
175 0 if no hscroll glyph was used,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
176 i.e. the window is not scrolled
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
177 horizontally. Used in tab
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
178 calculations. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
179
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
180 /* Information about the face the text should be displayed in and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
181 any begin-glyphs and end-glyphs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
182 struct extent_fragment *ef;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
183 face_index findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
184
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
185 /* 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
186 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
187 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
188 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
189 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
190 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
191 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
192 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
193 to the line. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
194 int new_ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
195 int new_descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
196 int max_pixmap_height;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
197 int need_baseline_computation;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
198 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
199
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
200 Lisp_Object result_str; /* String where we put the result of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
201 generating a formatted string in the modeline. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
202 int is_modeline; /* Non-zero if we're generating the modeline. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
203 Charcount modeline_charpos; /* Number of chars used in result_str so far;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
204 corresponds to bytepos. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
205 Bytecount bytepos; /* Number of bytes used in result_str so far.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
206 We don't actually copy the bytes into result_str
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
207 until the end because we don't know how big the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
208 string is going to be until then. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
209 } pos_data;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
210
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
211 enum prop_type
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
212 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
213 PROP_STRING,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
214 PROP_CHAR,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
215 PROP_MINIBUF_PROMPT,
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
216 PROP_BLANK,
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
217 PROP_GLYPH
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
218 };
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
219
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
220 /* 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
221 Ichar, a string of Ibyte's or a glyph.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
222
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
223 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
224 blocks.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
225
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
226 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
227 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
228 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
229 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
230 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
231 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
232 behavior.
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
233
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
234 #### It's unclean that both Ichars and Ibytes are here.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
235 */
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 typedef struct prop_block prop_block;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
238 struct prop_block
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
239 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
240 enum prop_type type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
241
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
242 union data
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
243 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
244 struct
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
245 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
246 Ibyte *str;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
247 Bytecount len; /* length of the string. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
248 } p_string;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
249
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
250 struct
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
251 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
252 Ichar ch;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
253 Bytebpos byte_cursor_charpos; /* NOTE: is in Bytebpos's */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
254 unsigned int cursor_type :3;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
255 } p_char;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
256
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
257 struct
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
258 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
259 int width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
260 face_index findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
261 } p_blank;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
262
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
263 struct
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
264 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
265 /* Not used as yet, but could be used to wrap rather than clip glyphs. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
266 int width;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
267 Lisp_Object glyph;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
268 } p_glyph;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
269
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
270 } data;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
271 };
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 typedef struct
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
274 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
275 Dynarr_declare (prop_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
276 } prop_block_dynarr;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
277
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
278
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
279 static Charcount generate_fstring_runes (struct window *w, pos_data *data,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
280 Charcount pos, Charcount min_pos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
281 Charcount max_pos, Lisp_Object elt,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
282 int depth, int max_pixsize,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
283 face_index findex, int type,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
284 Charcount *offset,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
285 Lisp_Object cur_ext);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
286 static prop_block_dynarr *add_glyph_rune (pos_data *data,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
287 struct glyph_block *gb,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
288 int pos_type, int allow_cursor,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
289 struct glyph_cachel *cachel);
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
290 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
291 Bytebpos byte_start_pos,
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
292 prop_block_dynarr **prop,
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
293 int type);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
294 static int create_overlay_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 create_left_glyph_block (struct window *w,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
297 struct display_line *dl,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
298 int overlay_width);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
299 static void create_right_glyph_block (struct window *w,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
300 struct display_line *dl);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
301 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
302 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
303 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
304 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
305 Charbpos to, Charbpos point,
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
306 int no_regen);
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
307 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
308 static void calculate_yoffset (struct display_line *dl,
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
309 struct display_block *fixup);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
310 static void calculate_baseline (pos_data *data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
311
1204
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
312 #ifdef ERROR_CHECK_DISPLAY
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
313 static void sledgehammer_check_redisplay_structs (void);
1204
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
314 #endif /* ERROR_CHECK_DISPLAY */
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
315
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
316 /* 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
317 #define INIT_MAX_PREEMPTS 30
1268
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
318 static Fixnum max_preempts;
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
319
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
320 #define QUEUED_EVENTS_REQUIRED_FOR_PREEMPTION 4
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
321
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
322 #define REDISPLAY_PREEMPTION_CHECK \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
323 ((void) \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
324 (preempted = \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
325 (!disable_preemption && \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
326 ((preemption_count < max_preempts) || !NILP (Vexecuting_macro)) && \
1268
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
327 (!INTERACTIVE || \
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
328 detect_input_pending (QUEUED_EVENTS_REQUIRED_FOR_PREEMPTION)))))
428
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 /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
331 * Redisplay global variables.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
332 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
333
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
334 /* We need a third set of display structures for the cursor motion
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
335 routines. We used to just give each window a third set. However,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
336 we always fully regenerate the structures when needed so there
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
337 isn't any reason we need more than a single set. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
338 display_line_dynarr *cmotion_display_lines;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
339
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
340 /* 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
341 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
342 this way rather than adding them as we generate the string because
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
343 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
344 (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
345 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
346 stretch off the end of the string. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
347 static EXTENT_dynarr *formatted_string_extent_dynarr;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
348 static Bytecount_dynarr *formatted_string_extent_start_dynarr;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
349 static Bytecount_dynarr *formatted_string_extent_end_dynarr;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
352 /* #### probably temporary */
458
c33ae14dd6d0 Import from CVS: tag r21-2-44
cvs
parents: 448
diff changeset
353 Fixnum cache_adjustment;
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 /* This holds a string representing the text corresponding to a single
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
356 modeline % spec. */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
357 static Ibyte_dynarr *mode_spec_ibyte_string;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
358
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
359 int in_display; /* 1 if in redisplay. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
360
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
473 Lisp_Object Vwindow_system; /* nil or a symbol naming the window system
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
474 under which emacs is running
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
475 ('x is the only current possibility) */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
476 Lisp_Object Vinitial_window_system;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
477
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
478 Lisp_Object Vglobal_mode_string;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
479
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
480 /* 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
481 it is <=0 then point is centered in the window */
458
c33ae14dd6d0 Import from CVS: tag r21-2-44
cvs
parents: 448
diff changeset
482 Fixnum scroll_step;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
483
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
484 /* 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
485 Fixnum scroll_conservatively;
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 /* 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
488 Lisp_Object Voverlay_arrow_position;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
489 /* String to display for the arrow. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
490 Lisp_Object Voverlay_arrow_string;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
491
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
492 Lisp_Object Qbuffer_list_changed_hook, Vbuffer_list_changed_hook;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
493
458
c33ae14dd6d0 Import from CVS: tag r21-2-44
cvs
parents: 448
diff changeset
494 static Fixnum last_display_warning_tick;
c33ae14dd6d0 Import from CVS: tag r21-2-44
cvs
parents: 448
diff changeset
495 static Fixnum display_warning_tick;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
496 Lisp_Object Qdisplay_warning_buffer;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
497 int inhibit_warning_display;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
498
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
499 Lisp_Object Vleft_margin_width, Vright_margin_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
500 Lisp_Object Vminimum_line_ascent, Vminimum_line_descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
501 Lisp_Object Vuse_left_overflow, Vuse_right_overflow;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
502 Lisp_Object Vtext_cursor_visible_p;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
503
1292
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
504 static Lisp_Object QSin_redisplay;
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
505
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
506 int column_number_start_at_one;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
507
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
508 Lisp_Object Qtop_bottom;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
509
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
510 #define WINDOW_SCROLLED(w) ((w)->hscroll > 0 || (w)->left_xoffset)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
511
1204
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
512 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
513 { XD_LISP_OBJECT, offsetof (struct rune_dglyph, glyph) },
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
514 { XD_LISP_OBJECT, offsetof (struct rune_dglyph, extent) },
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
515 { XD_END }
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
516 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
517
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
518 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
519 sizeof (struct rune_dglyph), rune_dglyph_description_1
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
520 };
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 static const struct memory_description rune_object_description_1[] = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
523 { XD_STRUCT_ARRAY, RUNE_DGLYPH, 1, &rune_dglyph_description },
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
524 { XD_END }
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 sized_memory_description rune_object_description = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
528 0, rune_object_description_1
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
529 };
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 static const struct memory_description rune_description_1[] = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
532 { XD_INT, offsetof (rune, type) },
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
533 { XD_UNION, offsetof (rune, object),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
534 XD_INDIRECT (0, 0), &rune_object_description },
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
535 { XD_END }
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
536 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
537
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
538 static const struct sized_memory_description rune_description = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
539 sizeof (rune),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
540 rune_description_1
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 memory_description rune_dynarr_description_1[] = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
544 XD_DYNARR_DESC (rune_dynarr, &rune_description),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
545 { XD_END }
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 sized_memory_description rune_dynarr_description = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
549 sizeof (rune_dynarr),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
550 rune_dynarr_description_1
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 memory_description display_block_description_1[] = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
554 { XD_STRUCT_PTR, offsetof (display_block, runes),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
555 1, &rune_dynarr_description },
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
556 { XD_END }
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
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
559 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
560 sizeof (display_block),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
561 display_block_description_1
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 memory_description display_block_dynarr_description_1[] = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
565 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
566 { XD_END }
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 sized_memory_description display_block_dynarr_description = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
570 sizeof (display_block_dynarr),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
571 display_block_dynarr_description_1
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 memory_description glyph_block_description_1[] = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
575 { XD_LISP_OBJECT, offsetof (glyph_block, glyph) },
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
576 { XD_LISP_OBJECT, offsetof (glyph_block, extent) },
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
577 { XD_END }
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
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
580 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
581 sizeof (glyph_block),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
582 glyph_block_description_1
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 memory_description glyph_block_dynarr_description_1[] = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
586 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
587 { XD_END }
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 sized_memory_description glyph_block_dynarr_description = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
591 sizeof (glyph_block_dynarr),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
592 glyph_block_dynarr_description_1
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 memory_description display_line_description_1[] = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
596 { XD_STRUCT_PTR, offsetof (display_line, display_blocks),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
597 1, &display_block_dynarr_description },
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
598 { XD_STRUCT_PTR, offsetof (display_line, left_glyphs),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
599 1, &glyph_block_dynarr_description },
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
600 { XD_STRUCT_PTR, offsetof (display_line, right_glyphs),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
601 1, &glyph_block_dynarr_description },
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
602 { XD_END }
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
603 };
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
604
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
605 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
606 sizeof (display_line),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
607 display_line_description_1
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 memory_description display_line_dynarr_description_1[] = {
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
611 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
612 { XD_END }
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 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
616 sizeof (display_line_dynarr),
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
617 display_line_dynarr_description_1
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
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
620
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
621 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
622 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
623 /* low-level interfaces onto device routines */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
624 /* */
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 static int
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
628 redisplay_text_width_ichar_string (struct window *w, int findex,
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
629 Ichar *str, Charcount len)
428
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 unsigned char charsets[NUM_LEADING_BYTES];
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
632 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
633
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
634 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
635 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
636 ensure_face_cachel_complete (WINDOW_FACE_CACHEL (w, findex), window,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
637 charsets);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
638 return DEVMETH (XDEVICE (FRAME_DEVICE (XFRAME (WINDOW_FRAME (w)))),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
639 text_width, (XFRAME (WINDOW_FRAME (w)),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
640 WINDOW_FACE_CACHEL (w, findex), str, len));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
641 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
642
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
643 static Ichar_dynarr *rtw_ichar_dynarr;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
644
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
645 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
646 redisplay_text_width_string (struct window *w, int findex,
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
647 Ibyte *nonreloc, Lisp_Object reloc,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
648 Bytecount offset, Bytecount len)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
649 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
650 if (!rtw_ichar_dynarr)
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
651 rtw_ichar_dynarr = Dynarr_new (Ichar);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
652 Dynarr_reset (rtw_ichar_dynarr);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
653
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
654 fixup_internal_substring (nonreloc, reloc, offset, &len);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
655 if (STRINGP (reloc))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
656 nonreloc = XSTRING_DATA (reloc);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
657 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
658 return redisplay_text_width_ichar_string
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
659 (w, findex, Dynarr_atp (rtw_ichar_dynarr, 0),
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
660 Dynarr_length (rtw_ichar_dynarr));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
661 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
662
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
663 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
664 redisplay_frame_text_width_string (struct frame *f, Lisp_Object face,
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
665 Ibyte *nonreloc, Lisp_Object reloc,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
666 Bytecount offset, Bytecount len)
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 unsigned char charsets[NUM_LEADING_BYTES];
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
669 Lisp_Object frame;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
670 struct face_cachel cachel;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
671
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
672 if (!rtw_ichar_dynarr)
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
673 rtw_ichar_dynarr = Dynarr_new (Ichar);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
674 Dynarr_reset (rtw_ichar_dynarr);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
675
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
676 fixup_internal_substring (nonreloc, reloc, offset, &len);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
677 if (STRINGP (reloc))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
678 nonreloc = XSTRING_DATA (reloc);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
679 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
680 find_charsets_in_ibyte_string (charsets, nonreloc, len);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
681 reset_face_cachel (&cachel);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
682 cachel.face = face;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
683 frame = wrap_frame (f);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
684 ensure_face_cachel_complete (&cachel, frame, charsets);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
685 return DEVMETH (XDEVICE (FRAME_DEVICE (f)),
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
686 text_width, (f, &cachel, Dynarr_atp (rtw_ichar_dynarr, 0),
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
687 Dynarr_length (rtw_ichar_dynarr)));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
688 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
689
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
690 /* 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
691 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
692 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
693
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
694 struct display_block *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
695 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
696 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
697 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
698 struct display_block db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
699
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
700 /* 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
701 if so, return it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
702 if (dl->display_blocks)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
703 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
704 for (elt = 0; elt < Dynarr_length (dl->display_blocks); elt++)
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 if (Dynarr_at (dl->display_blocks, elt).type == type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
707 return Dynarr_atp (dl->display_blocks, elt);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
710 /* There isn't an active block of the desired type, but there
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
711 might still be allocated blocks we need to reuse. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
712 if (elt < Dynarr_largest (dl->display_blocks))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
713 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
714 struct display_block *dbp = Dynarr_atp (dl->display_blocks, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
715
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
716 /* 'add' the block to the list */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
717 Dynarr_increment (dl->display_blocks);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
718
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
719 /* initialize and return */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
720 dbp->type = type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
721 return dbp;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
724 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
725 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
726 /* This line doesn't have any display blocks, so initialize the display
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
727 bock array. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
728 dl->display_blocks = Dynarr_new (display_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
729 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
730
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
731 /* 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
732 one and add it to the line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
733 xzero (db);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
734 db.type = type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
735 db.runes = Dynarr_new (rune);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
736 Dynarr_add (dl->display_blocks, db);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
737
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
738 /* Return the newly added display block. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
739 elt = Dynarr_length (dl->display_blocks) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
740
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
741 return Dynarr_atp (dl->display_blocks, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
742 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
743
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
744 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
745 tab_char_width (struct window *w)
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 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
748 int char_tab_width = XINT (b->tab_width);
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 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
751
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
752 return char_tab_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
753 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
754
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
755 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
756 space_width (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
757 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
758 /* While tabs are traditional composed of spaces, for variable-width
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
759 fonts the space character tends to give too narrow a value. So
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
760 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
761 character width for the default face. If this is actually
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
762 defined by the font then it is probably the best thing to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
763 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
764 already calculated its width. Thus we can avoid a call to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
765 XTextWidth on X frames by just querying the default width. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
766 return XFONT_INSTANCE
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
767 (WINDOW_FACE_CACHEL_FONT (w, DEFAULT_INDEX, Vcharset_ascii))->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
768 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
769
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
770 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
771 tab_pix_width (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
772 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
773 return space_width (w) * tab_char_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
774 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
775
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
776 /* Given a pixel position in a window, return the pixel location of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
777 the next tabstop. Tabs are calculated from the left window edge in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
778 terms of spaces displayed in the default face. Formerly the space
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
779 width was determined using the currently active face. That method
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
780 leads to tabstops which do not line up. */
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 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
783 next_tab_position (struct window *w, int start_pixpos, int left_pixpos)
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 int n_pos = left_pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
786 int pix_tab_width = tab_pix_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
787
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
788 /* Adjust n_pos for any hscrolling which has happened. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
789 if (WINDOW_SCROLLED (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
790 n_pos -= space_width (w) * (w->hscroll - 1) + w->left_xoffset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
791
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
792 while (n_pos <= start_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
793 n_pos += pix_tab_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
794
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
795 return n_pos;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
798 /* For the given window, calculate the outside and margin boundaries for a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
799 display line. The whitespace boundaries must be calculated by the text
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
800 layout routines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
801
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
802 layout_bounds
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
803 calculate_display_line_boundaries (struct window *w, int modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
804 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
805 layout_bounds bounds;
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 /* Set the outermost boundaries which are the boundaries of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
808 window itself minus the gutters (and minus the scrollbars if this
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
809 is for the modeline). */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
810 if (!modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
811 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
812 bounds.left_out = WINDOW_TEXT_LEFT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
813 bounds.right_out = WINDOW_TEXT_RIGHT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
814 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
815 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
816 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
817 bounds.left_out = WINDOW_MODELINE_LEFT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
818 bounds.right_out = WINDOW_MODELINE_RIGHT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
819 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
820
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
821 /* The inner boundaries mark where the glyph margins are located. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
822 bounds.left_in = bounds.left_out + window_left_margin_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
823 bounds.right_in = bounds.right_out - window_right_margin_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
824
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
825 /* We cannot fully calculate the whitespace boundaries as they
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
826 depend on the contents of the line being displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
827 bounds.left_white = bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
828 bounds.right_white = bounds.right_in;
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 return bounds;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
831 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
832
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
833 /* 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
834 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
835 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
836
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
837 static void
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
838 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
839 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
840 int i;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
841 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
842 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
843 struct rune *r = Dynarr_atp (fixup->runes,i);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
844 if (r->type == RUNE_DGLYPH)
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 if (r->object.dglyph.ascent < dl->ascent)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
847 r->object.dglyph.yoffset = dl->ascent - r->object.dglyph.ascent +
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
848 r->object.dglyph.descent;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
849 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
850 }
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
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
853 /* 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
854 display_line as a whole).
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
855
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
856 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
857 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
858 (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
859 us by `add_ichar_rune'.)
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
860
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
861 If the baseline 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
862 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
863 work.
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 contains pixmaps, and at least one is automatically
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
866 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
867 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
868 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
869 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
870 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
871 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
872 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
873 such that the largest glyph will fit.
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
874
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
875 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
876 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
877 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
878 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
879 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
880 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
881
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
882 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
883 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
884 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
885 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
886
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
887 static void
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
888 calculate_baseline (pos_data *data)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
889 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
890 /* Blank line: baseline is default font's baseline. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
891
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
892 if (!data->new_ascent && !data->new_descent)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
893 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
894 /* We've got a blank line so initialize these values from the default
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
895 face. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
896 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
897 &data->new_descent, 0, 0, 0);
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
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
900 /* No automatically positioned glyphs? Return at once. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
901 if (!data->need_baseline_computation)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
902 return;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
903
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
904 /* 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
905 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
906 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
907 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
908 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
909 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
910 int scaled_default_font_ascent, scaled_default_font_descent;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
911
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
912 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
913 &default_font_descent, &default_font_height,
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
914 0, 0);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
915
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
916 scaled_default_font_ascent = data->max_pixmap_height *
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
917 default_font_ascent / default_font_height;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
918
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
919 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
920
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
921 /* The ascent may have expanded now. Do we still need to grow the descent,
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
922 or are things big enough?
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
923
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
924 The +1 caters for the baseline row itself. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
925 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
926 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
927 scaled_default_font_descent = (data->max_pixmap_height *
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
928 default_font_descent / default_font_height) + 1;
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 data->new_descent = max (data->new_descent, scaled_default_font_descent);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
931 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
932 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
933 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
934
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
935 /* Given a display line and a starting position, ensure that the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
936 contents of the display line accurately represent the visual
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
937 representation of the buffer contents starting from the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
938 position when displayed in the given window. The display line ends
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
939 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
940 window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
941
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
942 static Charbpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
943 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
944 Charbpos start_pos, prop_block_dynarr **prop,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
945 int type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
946 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
947 Charbpos ret_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
948 int overlay_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
949 struct buffer *b = XBUFFER (WINDOW_BUFFER (w));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
950
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
951 /* 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
952 if (!bounds)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
953 dl->bounds = calculate_display_line_boundaries (w, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
954
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
955 /* Reset what this line is using. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
956 if (dl->display_blocks)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
957 Dynarr_reset (dl->display_blocks);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
958 if (dl->left_glyphs)
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 Dynarr_free (dl->left_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
961 dl->left_glyphs = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
962 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
963 if (dl->right_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
964 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
965 Dynarr_free (dl->right_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
966 dl->right_glyphs = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
967 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
968
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
969 /* We aren't generating a modeline at the moment. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
970 dl->modeline = 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 /* Create a display block for the text region of the line. */
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 /* #### urk urk urk!!! Chuck fix this shit! */
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
975 Bytebpos hacked_up_bytebpos =
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
976 create_text_block (w, dl, charbpos_to_bytebpos (b, start_pos),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
977 prop, type);
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
978 if (hacked_up_bytebpos > BYTE_BUF_ZV (b))
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
979 ret_charpos = BUF_ZV (b) + 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
980 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
981 ret_charpos = bytebpos_to_charbpos (b, hacked_up_bytebpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
982 }
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
983 dl->charpos = start_pos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
984 if (dl->end_charpos < dl->charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
985 dl->end_charpos = dl->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
986
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
987 if (MARKERP (Voverlay_arrow_position)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
988 && EQ (w->buffer, Fmarker_buffer (Voverlay_arrow_position))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
989 && start_pos == marker_position (Voverlay_arrow_position)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
990 && (STRINGP (Voverlay_arrow_string)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
991 || GLYPHP (Voverlay_arrow_string)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
992 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
993 overlay_width = create_overlay_glyph_block (w, dl);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
994 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
995 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
996 overlay_width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
997
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
998 /* If there are left glyphs associated with any character in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
999 text block, then create a display block to handle them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1000 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1001 create_left_glyph_block (w, dl, overlay_width);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1002
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1003 /* If there are right glyphs associated with any character in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1004 text block, then create a display block to handle them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1005 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1006 create_right_glyph_block (w, dl);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1007
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1008 /* In the future additional types of display blocks may be generated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1009 here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1010
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1011 w->last_redisplay_pos = ret_charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1012
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1013 return ret_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1014 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1015
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1016 /* 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
1017 the block had better be empty.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1018
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1019 Yes, there are multiple places where this function is called but
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1020 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
1021 with byte_start_col_enabled a little differently depending on the
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1022 object being worked with. */
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 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1025 add_hscroll_rune (pos_data *data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1026 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1027 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1028 prop_block_dynarr *retval;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1029 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
1030 int old_cursor_type = data->cursor_type;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1031 Bytebpos byte_old_charpos = data->byte_charpos;
428
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 if (data->cursor_type == CURSOR_ON
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1034 && 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
1035 && data->byte_cursor_charpos <= data->byte_charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1036 {
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1037 data->byte_cursor_charpos = data->byte_start_col_enabled;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1038 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1039 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1040 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1041 data->cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1042 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1043
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1044 data->byte_endpos = data->byte_charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1045 data->byte_charpos = data->byte_start_col_enabled;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1046
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1047 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1048 gb.glyph = Vhscroll_glyph;
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 int oldpixpos = data->pixpos;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1051 retval = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1052 GLYPH_CACHEL (XWINDOW (data->window),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1053 HSCROLL_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1054 data->hscroll_glyph_width_adjust =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1055 data->pixpos - oldpixpos - space_width (XWINDOW (data->window));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1056 }
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1057 data->byte_endpos = 0;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1058 data->byte_cursor_charpos = byte_old_cursor_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1059 data->cursor_type = old_cursor_type;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1060 data->byte_charpos = byte_old_charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1061
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1062 data->byte_start_col_enabled = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1063 return retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1064 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1065
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1066 /* 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
1067 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
1068 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
1069 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
1070 to affect the total line height. (See add_ibyte_string_runes()). */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1071
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1072 static prop_block_dynarr *
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1073 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
1074 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1075 struct rune rb, *crb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1076 int width, local;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1077
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1078 if (data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1079 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1080 data->start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1081
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1082 if (data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1083 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1084 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1085
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1086 if (data->byte_start_col_enabled)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1087 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1088 return add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1089 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1090
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1091 if (data->ch == '\n')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1092 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1093 data->font_is_bogus = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1094 /* Cheesy end-of-line pseudo-character. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1095 width = data->blank_width;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1098 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1099 Lisp_Object charset = ichar_charset (data->ch);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1100 if (!EQ (charset, data->last_charset) ||
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1101 data->findex != data->last_findex)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1102 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1103 /* OK, we need to do things the hard way. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1104 struct window *w = XWINDOW (data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1105 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, data->findex);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1106 Lisp_Object font_instance =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1107 ensure_face_cachel_contains_charset (cachel, data->window,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1108 charset);
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1109 Lisp_Font_Instance *fi;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1110
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1111 if (EQ (font_instance, Vthe_null_font_instance))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1112 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1113 font_instance = FACE_CACHEL_FONT (cachel, Vcharset_ascii);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1114 data->font_is_bogus = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1115 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1116 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1117 data->font_is_bogus = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1118
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1119 fi = XFONT_INSTANCE (font_instance);
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1120 if (!fi->proportional_p || data->font_is_bogus)
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1121 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1122 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
1123
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1124 data->last_char_width =
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1125 redisplay_text_width_ichar_string (XWINDOW (data->window),
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1126 data->findex, &ch, 1);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1127 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1128 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1129 data->last_char_width = -1;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1130
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1131 if (!no_contribute_to_line_height)
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1132 {
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1133 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
1134 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
1135 }
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1136
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1137 data->last_charset = charset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1138 data->last_findex = data->findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1139 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1140
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1141 width = data->last_char_width;
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1142 if (width < 0) /* proportional fonts */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1143 width = redisplay_text_width_ichar_string (XWINDOW (data->window),
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1144 data->findex,
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
1145 &data->ch, 1);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1146 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1147
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1148 if (data->max_pixpos != -1 && (data->pixpos + width > data->max_pixpos))
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 return ADD_FAILED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1151 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1152
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1153 if (Dynarr_length (data->db->runes) < Dynarr_largest (data->db->runes))
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 crb = Dynarr_atp (data->db->runes, Dynarr_length (data->db->runes));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1156 local = 0;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1159 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1160 crb = &rb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1161 local = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1162 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1163
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1164 crb->findex = data->findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1165 crb->xpos = data->pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1166 crb->width = width;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1167 if (data->byte_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1168 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1169 if (NILP (data->string))
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1170 crb->charpos =
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1171 bytebpos_to_charbpos (XBUFFER (WINDOW_BUFFER
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1172 (XWINDOW (data->window))),
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1173 data->byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1174 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1175 crb->charpos =
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1176 string_index_byte_to_char (data->string, data->byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1177 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1178 else if (data->is_modeline)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1179 crb->charpos = data->modeline_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1180 else
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1181 /* Text but not in buffer */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1182 crb->charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1183 crb->type = RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1184 crb->object.chr.ch = data->font_is_bogus ? '~' : data->ch;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1185 crb->endpos = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1186
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1187 if (data->cursor_type == CURSOR_ON)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1188 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1189 if (data->byte_charpos == data->byte_cursor_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1190 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1191 crb->cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1192 data->cursor_x = Dynarr_length (data->db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1193 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1194 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1195 crb->cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1196 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1197 else if (data->cursor_type == NEXT_CURSOR)
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 data->cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1202 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1203 else if (data->cursor_type == IGNORE_CURSOR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1204 crb->cursor_type = IGNORE_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1205 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1206 crb->cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1207
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1208 if (local)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1209 Dynarr_add (data->db->runes, *crb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1210 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1211 Dynarr_increment (data->db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1212
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1213 data->pixpos += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1214
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1215 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1216 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1217
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1218 static prop_block_dynarr *
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1219 add_ichar_rune (pos_data *data)
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1220 {
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1221 return add_ichar_rune_1 (data, 0);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1222 }
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1223
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1224 /* 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
1225 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
1226 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
1227 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
1228 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
1229 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
1230 whether glyph-contrib-p is true.) */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1231
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1232 static prop_block_dynarr *
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1233 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
1234 Bytecount c_length, int no_prop,
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1235 int no_contribute_to_line_height)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1236 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1237 Ibyte *pos, *end = c_string + c_length;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1238 prop_block_dynarr *prop;
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 /* #### This function is too simplistic. It needs to do the same
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1241 sort of character interpretation (display-table lookup,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1242 ctl-arrow checking), etc. that create_text_block() does.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1243 The functionality to do this in that routine needs to be
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1244 modularized. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1245
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1246 for (pos = c_string; pos < end;)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1247 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1248 Ibyte *old_pos = pos;
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1249
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1250 data->ch = itext_ichar (pos);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1251
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1252 prop = add_ichar_rune_1 (data, no_contribute_to_line_height);
428
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 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1255 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1256 if (no_prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1257 return ADD_FAILED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1258 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1259 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1260 struct prop_block pb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1261 Bytecount len = end - pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1262 prop = Dynarr_new (prop_block);
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 pb.type = PROP_STRING;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1265 pb.data.p_string.str = xnew_array (Ibyte, len);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1266 strncpy ((char *) pb.data.p_string.str, (char *) pos, len);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1267 pb.data.p_string.len = len;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1268
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1269 Dynarr_add (prop, pb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1270 return prop;
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 }
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1273 INC_IBYTEPTR (pos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1274 assert (pos <= end);
464
5aa1854ad537 Import from CVS: tag r21-2-47
cvs
parents: 462
diff changeset
1275 /* #### Duplicate code from add_string_to_fstring_db_runes
5aa1854ad537 Import from CVS: tag r21-2-47
cvs
parents: 462
diff changeset
1276 should we do more?*/
5aa1854ad537 Import from CVS: tag r21-2-47
cvs
parents: 462
diff changeset
1277 data->bytepos += pos - old_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1278 }
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 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1281 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1282
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1283 /* 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
1284 rune will be displayed in the foreground color of the associated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1285 face. */
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 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1288 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
1289 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1290 struct rune rb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1291
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1292 /* 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
1293 been to add it as a tab. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1294 if (data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1295 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1296 /* assert (w != NULL) */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1297 prop_block_dynarr *retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1298
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1299 /* If we have still not fully scrolled horizontally, subtract
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1300 the width of this tab and return. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1301 if (char_tab_width < data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1302 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1303 data->start_col -= char_tab_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1304 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1305 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1306 else if (char_tab_width == data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1307 data->blank_width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1308 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1309 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1310 int spcwid = space_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1311
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1312 if (spcwid >= data->blank_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1313 data->blank_width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1314 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1315 data->blank_width -= spcwid;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1316 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1317
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1318 data->start_col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1319 retval = add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1320
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1321 /* Could be caused by the handling of the hscroll rune. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1322 if (retval != NULL || !data->blank_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1323 return retval;
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 /* Blank runes are always calculated to fit. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1327 assert (data->pixpos + data->blank_width <= data->max_pixpos);
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 rb.findex = data->findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1330 rb.xpos = data->pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1331 rb.width = data->blank_width;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1332 if (data->byte_charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1333 rb.charpos =
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
1334 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
1335 data->byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1336 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1337 /* #### and this is really correct too? */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1338 rb.charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1339 rb.endpos = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1340 rb.type = RUNE_BLANK;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1341
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1342 if (data->cursor_type == CURSOR_ON)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1343 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1344 if (data->byte_charpos == data->byte_cursor_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1345 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1346 rb.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1347 data->cursor_x = Dynarr_length (data->db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1348 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1349 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1350 rb.cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1351 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1352 else if (data->cursor_type == NEXT_CURSOR)
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 data->cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1357 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1358 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1359 rb.cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1360
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1361 Dynarr_add (data->db->runes, rb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1362 data->pixpos += data->blank_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1363
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1364 return NULL;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1367 /* Add runes representing a character in octal. */
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 #define ADD_NEXT_OCTAL_RUNE_CHAR do \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1370 { \
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1371 if (add_failed || (add_failed = add_ichar_rune (data))) \
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1372 { \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1373 struct prop_block pb; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1374 if (!prop) \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1375 prop = Dynarr_new (prop_block); \
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 pb.type = PROP_CHAR; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1378 pb.data.p_char.ch = data->ch; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1379 pb.data.p_char.cursor_type = data->cursor_type; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1380 Dynarr_add (prop, pb); \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1381 } \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1382 } while (0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1383
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1384 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1385 add_octal_runes (pos_data *data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1386 {
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1387 prop_block_dynarr *add_failed, *prop = 0;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1388 Ichar orig_char = data->ch;
647
b39c14581166 [xemacs-hg @ 2001-08-13 04:45:47 by ben]
ben
parents: 638
diff changeset
1389 int orig_cursor_type = data->cursor_type;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1390
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1391 /* Initialize */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1392 add_failed = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1393
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1394 if (data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1395 data->start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1396
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1397 if (!data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1398 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1399 if (data->byte_start_col_enabled)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1400 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1401 add_failed = add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1402 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1403 else
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 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1406 struct window *w = XWINDOW (data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1407
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1408 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1409 gb.glyph = Voctal_escape_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1410 add_failed =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1411 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1412 GLYPH_CACHEL (w, OCT_ESC_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1413 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1414 }
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 /* We only propagate information if the glyph was partially
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1417 added. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1418 if (add_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1419 return add_failed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1420
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1421 data->cursor_type = IGNORE_CURSOR;
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 if (data->ch >= 0x100)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1424 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1425 /* If the character is an extended Mule character, it could have
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1426 up to 19 bits. For the moment, we treat it as a seven-digit
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1427 octal number. This is not that pretty, but whatever. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1428 data->ch = (7 & (orig_char >> 18)) + '0';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1429 ADD_NEXT_OCTAL_RUNE_CHAR;
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 data->ch = (7 & (orig_char >> 15)) + '0';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1432 ADD_NEXT_OCTAL_RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1433
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1434 data->ch = (7 & (orig_char >> 12)) + '0';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1435 ADD_NEXT_OCTAL_RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1436
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1437 data->ch = (7 & (orig_char >> 9)) + '0';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1438 ADD_NEXT_OCTAL_RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1439 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1440
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1441 data->ch = (7 & (orig_char >> 6)) + '0';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1442 ADD_NEXT_OCTAL_RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1443
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1444 data->ch = (7 & (orig_char >> 3)) + '0';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1445 ADD_NEXT_OCTAL_RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1446
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1447 data->ch = (7 & orig_char) + '0';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1448 ADD_NEXT_OCTAL_RUNE_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1449
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1450 data->cursor_type = orig_cursor_type;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1451 return NULL;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1452 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1453
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1454 #undef ADD_NEXT_OCTAL_RUNE_CHAR
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1455
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1456 /* Add runes representing a control character to a display block. */
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 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1459 add_control_char_runes (pos_data *data, struct buffer *b)
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 if (!NILP (b->ctl_arrow))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1462 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1463 prop_block_dynarr *prop;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1464 Ichar orig_char = data->ch;
647
b39c14581166 [xemacs-hg @ 2001-08-13 04:45:47 by ben]
ben
parents: 638
diff changeset
1465 int old_cursor_type = data->cursor_type;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1466
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1467 /* Initialize */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1468 prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1469
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1470 if (data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1471 data->start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1472
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1473 if (!data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1474 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1475 if (data->byte_start_col_enabled)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1476 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1477 prop_block_dynarr *retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1478
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1479 retval = add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1480 if (retval)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1481 return retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1482 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1483 else
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 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1486 struct window *w = XWINDOW (data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1487
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1488 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1489 gb.glyph = Vcontrol_arrow_glyph;
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 /* We only propagate information if the glyph was partially
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1492 added. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1493 if (add_glyph_rune (data, &gb, BEGIN_GLYPHS, 1,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1494 GLYPH_CACHEL (w, CONTROL_GLYPH_INDEX)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1495 return ADD_FAILED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1496 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1497 }
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 if (orig_char == 0177)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1500 data->ch = '?';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1501 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1502 data->ch = orig_char ^ 0100;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1503 data->cursor_type = IGNORE_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1504
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1505 if (add_ichar_rune (data))
428
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 struct prop_block pb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1508 if (!prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1509 prop = Dynarr_new (prop_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1510
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1511 pb.type = PROP_CHAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1512 pb.data.p_char.ch = data->ch;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1513 pb.data.p_char.cursor_type = data->cursor_type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1514 Dynarr_add (prop, pb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1515 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1516
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1517 data->cursor_type = old_cursor_type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1518 return prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1519 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1520 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1521 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1522 return add_octal_runes (data);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1526 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1527 add_disp_table_entry_runes_1 (pos_data *data, Lisp_Object entry)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1528 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1529 prop_block_dynarr *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1530
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1531 if (STRINGP (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1532 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1533 prop = add_ibyte_string_runes (data,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1534 XSTRING_DATA (entry),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1535 XSTRING_LENGTH (entry),
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
1536 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1537 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1538 else if (GLYPHP (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1539 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1540 if (data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1541 data->start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1542
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1543 if (!data->start_col && data->byte_start_col_enabled)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1544 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1545 prop = add_hscroll_rune (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1546 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1547 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1548 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1549 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1550
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1551 gb.glyph = entry;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1552 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1553 prop = add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1556 else if (CHAR_OR_CHAR_INTP (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1557 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1558 data->ch = XCHAR_OR_CHAR_INT (entry);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1559 prop = add_ichar_rune (data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1560 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1561 else if (CONSP (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1562 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1563 if (EQ (XCAR (entry), Qformat)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1564 && CONSP (XCDR (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1565 && STRINGP (XCAR (XCDR (entry))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1566 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1567 Lisp_Object format = XCAR (XCDR (entry));
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
1568 Bytebpos len = XSTRING_LENGTH (format);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1569 Ibyte *src = XSTRING_DATA (format), *end = src + len;
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1570 Ibyte *result = alloca_array (Ibyte, len);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1571 Ibyte *dst = result;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1572
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1573 while (src < end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1574 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1575 Ichar c = itext_ichar (src);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1576 INC_IBYTEPTR (src);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1577 if (c != '%' || src == end)
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1578 dst += set_itext_ichar (dst, c);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1579 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1580 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1581 c = itext_ichar (src);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1582 INC_IBYTEPTR (src);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1583 switch (c)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1584 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1585 /*case 'x':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1586 dst += long_to_string_base ((char *)dst, data->ch, 16);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1587 break;*/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1588 case '%':
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1589 dst += set_itext_ichar (dst, '%');
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1590 break;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1591 /* #### unimplemented */
428
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1594 }
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1595 prop = add_ibyte_string_runes (data, result, dst - result, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1596 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1597 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1598
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1599 /* 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
1600 have any safe way of signaling an error. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1601 return prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1602 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1603
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1604 /* Given a display table entry, call the appropriate functions to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1605 display each element of the entry. */
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 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1608 add_disp_table_entry_runes (pos_data *data, Lisp_Object entry)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1609 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1610 prop_block_dynarr *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1611 if (VECTORP (entry))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1612 {
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1613 Lisp_Vector *de = XVECTOR (entry);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1614 EMACS_INT len = vector_length (de);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1615 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1616
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1617 for (elt = 0; elt < len; elt++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1618 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1619 if (NILP (vector_data (de)[elt]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1620 continue;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1621 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1622 prop = add_disp_table_entry_runes_1 (data, vector_data (de)[elt]);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1623 /* Else blow it off because someone added a bad entry and we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1624 don't have any safe way of signaling an error. Hey, this
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1625 comment sounds familiar. */
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 /* #### Still need to add any remaining elements to the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1628 propagation information. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1629 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1630 return prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1631 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1632 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1633 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1634 prop = add_disp_table_entry_runes_1 (data, entry);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1635 return prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1636 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1637
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1638 /* Add runes which were propagated from the previous line. */
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 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1641 add_propagation_runes (prop_block_dynarr **prop, pos_data *data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1642 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1643 /* #### Remember to handle start_col parameter of data when the rest of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1644 this is finished. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1645 /* #### Chuck -- I've redone this function a bit. It looked like the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1646 case of not all the propagation blocks being added was not handled
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1647 well. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1648 /* #### Chuck -- I also think the double indirection of PROP is kind
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1649 of bogus. A cleaner solution is just to check for
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1650 Dynarr_length (prop) > 0. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1651 /* #### This function also doesn't even pay attention to ADD_FAILED!
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1652 This is seriously fucked! Seven ####'s in 130 lines -- is that a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1653 record? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1654 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1655 prop_block_dynarr *add_failed;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1656 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
1657 int old_cursor_type = data->cursor_type;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1658
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1659 for (elt = 0; elt < Dynarr_length (*prop); elt++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1660 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1661 struct prop_block *pb = Dynarr_atp (*prop, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1662
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1663 switch (pb->type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1664 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1665 case PROP_CHAR:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1666 data->ch = pb->data.p_char.ch;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1667 data->byte_cursor_charpos = pb->data.p_char.byte_cursor_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1668 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
1669 add_failed = add_ichar_rune (data);
428
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 if (add_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1672 goto oops_no_more_space;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1673 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1674 case PROP_STRING:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1675 if (pb->data.p_string.str)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1676 xfree (pb->data.p_string.str);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1677 /* #### bogus bogus -- this doesn't do anything!
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1678 Should probably call add_ibyte_string_runes(),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1679 once that function is fixed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1680 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1681 case PROP_MINIBUF_PROMPT:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1682 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1683 face_index old_findex = data->findex;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1684 Bytebpos byte_old_charpos = data->byte_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1685
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1686 data->findex = DEFAULT_INDEX;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1687 data->byte_charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1688 data->cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1689
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1690 while (pb->data.p_string.len > 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1691 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1692 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
1693 add_failed = add_ichar_rune (data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1694
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1695 if (add_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1696 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1697 data->findex = old_findex;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1698 data->byte_charpos = byte_old_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1699 goto oops_no_more_space;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1700 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1701 else
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 /* Complicated equivalent of ptr++, len-- */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1704 Ibyte *oldpos = pb->data.p_string.str;
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1705 INC_IBYTEPTR (pb->data.p_string.str);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1706 pb->data.p_string.len -= pb->data.p_string.str - oldpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1707 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1708 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1709
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1710 data->findex = old_findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1711 /* ##### FIXME FIXME FIXME -- Upon successful return from
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1712 this function, data->byte_charpos is automatically incremented.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1713 However, we don't want that to happen if we were adding
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1714 the minibuffer prompt. */
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 struct buffer *buf =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1717 XBUFFER (WINDOW_BUFFER (XWINDOW (data->window)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1718 /* #### 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
1719 if (byte_old_charpos > BYTE_BUF_BEGV (buf))
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1720 data->byte_charpos = prev_bytebpos (buf, byte_old_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1721 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1722 /* #### is this correct? Does anyone know?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1723 Does anyone care? Is this a cheesy hack or what? */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1724 data->byte_charpos = BYTE_BUF_BEGV (buf) - 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1725 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1726 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1727 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1728 case PROP_BLANK:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1729 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1730 /* #### I think it's unnecessary and misleading to preserve
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1731 the blank_width, as it implies that the value carries
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1732 over from one rune to the next, which is wrong. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1733 int old_width = data->blank_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1734 face_index old_findex = data->findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1735
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1736 data->findex = pb->data.p_blank.findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1737 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
1738 data->byte_cursor_charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1739 data->cursor_type = IGNORE_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1740
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1741 if (data->pixpos + data->blank_width > data->max_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1742 data->blank_width = data->max_pixpos - data->pixpos;
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 /* We pass a bogus value of char_tab_width. It shouldn't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1745 matter because unless something is really screwed up
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1746 this call won't cause that arg to be used. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1747 add_failed = add_blank_rune (data, XWINDOW (data->window), 0);
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 /* This can happen in the case where we have a tab which
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1750 is wider than the window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1751 if (data->blank_width != pb->data.p_blank.width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1752 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1753 pb->data.p_blank.width -= data->blank_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1754 add_failed = ADD_FAILED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1755 }
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 data->findex = old_findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1758 data->blank_width = old_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1759
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1760 if (add_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1761 goto oops_no_more_space;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1762 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1763 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1764 default:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1765 abort ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1766 }
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1769 oops_no_more_space:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1770
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1771 data->byte_cursor_charpos = byte_old_cursor_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1772 data->cursor_type = old_cursor_type;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1773 if (elt < Dynarr_length (*prop))
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 Dynarr_delete_many (*prop, 0, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1776 return *prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1777 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1778 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1779 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1780 Dynarr_free (*prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1781 return NULL;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1784
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1785 /* Add 'text layout glyphs at position POS_TYPE that are contained to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1786 the display block, but add all other types to the appropriate list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1787 of the display line. They will be added later by different
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1788 routines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1789
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1790 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1791 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
1792 int allow_cursor, struct glyph_cachel *cachel)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1793 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1794 struct window *w = XWINDOW (data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1795
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1796 /* If window faces changed, and glyph instance is text, then
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1797 glyph sizes might have changed too */
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1798 invalidate_glyph_geometry_maybe (gb->glyph, w);
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
1799
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1800 /* This makes sure the glyph is in the cachels.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1801
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1802 #### 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
1803 so that the dirty flag can be reset after redisplay has
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1804 finished. We should do this some other way, maybe by iterating
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1805 over the window cache of subwindows. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1806 get_glyph_cachel_index (w, gb->glyph);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1807
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1808 /* A nil extent indicates a special glyph (ex. truncator). */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1809 if (NILP (gb->extent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1810 || (pos_type == BEGIN_GLYPHS &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1811 extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1812 || (pos_type == END_GLYPHS &&
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1813 extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_TEXT)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1814 || pos_type == LEFT_GLYPHS || pos_type == RIGHT_GLYPHS)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1815 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1816 struct rune rb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1817 int width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1818 int xoffset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1819 int ascent, descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1820 Lisp_Object baseline;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1821 Lisp_Object face;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1822 Lisp_Object instance;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1823 face_index findex;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1824 prop_block_dynarr *retval = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1825
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1826 if (cachel)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1827 width = cachel->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1828 else
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
1829 width = glyph_width (gb->glyph, data->window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1830
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1831 if (!width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1832 return NULL;
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 (data->start_col || data->start_col_xoffset)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1835 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1836 int glyph_char_width = width / space_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1837
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1838 /* If we still have not fully scrolled horizontally after
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1839 taking into account the width of the glyph, subtract its
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1840 width and return. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1841 if (glyph_char_width < data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1842 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1843 data->start_col -= glyph_char_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1844 return NULL;
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 else if (glyph_char_width == data->start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1847 width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1848 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1849 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1850 xoffset = space_width (w) * data->start_col;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1851 width -= xoffset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1852
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1853 /* #### Can this happen? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1854 if (width < 0)
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 }
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 data->start_col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1859 retval = add_hscroll_rune (data);
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 /* Could be caused by the handling of the hscroll rune. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1862 if (retval != NULL || !width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1863 return retval;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1866 xoffset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1867
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1868 if (data->pixpos + width > data->max_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1869 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1870 /* 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
1871 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
1872 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
1873 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
1874 than the window. We could alternatively just completely
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1875 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
1876 this is a better solution.
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1877
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1878 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
1879 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
1880 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
1881 start-glyph that covers multitple following
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1882 characters. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1883 if (Dynarr_length (data->db->runes)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1884 && data->max_pixpos - data->pixpos < horizontal_clip)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1885 return ADD_FAILED;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1886 else {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1887 struct prop_block pb;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1888
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1889 /* 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
1890 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
1891 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
1892 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
1893 search the runes in create_text_block(). */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1894 if (data->ch == '\n')
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1895 data->max_pixpos += data->end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1896 width = data->max_pixpos - data->pixpos;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1897 /* 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
1898 propagation data so that we don't try and do it
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1899 again. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1900 retval = Dynarr_new (prop_block);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1901 pb.type = PROP_GLYPH;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1902 pb.data.p_glyph.glyph = gb->glyph;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1903 pb.data.p_glyph.width = width;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1904 Dynarr_add (retval, pb);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1905 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1906 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1907
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1908 if (cachel)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1909 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1910 ascent = cachel->ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1911 descent = cachel->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1912 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1913 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1914 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
1915 ascent = glyph_ascent (gb->glyph, data->window);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
1916 descent = glyph_descent (gb->glyph, data->window);
428
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1919 baseline = glyph_baseline (gb->glyph, data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1920
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1921 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
1922
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1923 if (glyph_contrib_p (gb->glyph, data->window))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1924 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1925 /* A pixmap that has not had a baseline explicitly set. Its
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1926 contribution will be determined later. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1927 if (NILP (baseline))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1928 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1929 int height = ascent + descent;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1930 data->need_baseline_computation = 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1931 data->max_pixmap_height = max (data->max_pixmap_height, height);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1934 /* A string so determine contribution normally. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1935 else if (EQ (baseline, Qt))
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 data->new_ascent = max (data->new_ascent, ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1938 data->new_descent = max (data->new_descent, descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1939 }
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 /* A pixmap with an explicitly set baseline. We determine the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1942 contribution here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1943 else if (INTP (baseline))
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 int height = ascent + descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1946 int pix_ascent, pix_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 pix_ascent = height * XINT (baseline) / 100;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1949 pix_descent = height - pix_ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1950
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1951 data->new_ascent = max (data->new_ascent, pix_ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1952 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
1953 data->max_pixmap_height = max (data->max_pixmap_height, height);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1954
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
1955 rb.object.dglyph.descent = pix_descent;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1956 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1957
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1958 /* Otherwise something is screwed up. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1959 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1960 abort ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1961 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1962
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1963 face = glyph_face (gb->glyph, data->window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1964 if (NILP (face))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1965 findex = data->findex;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1966 else
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1967 findex = get_builtin_face_cache_index (w, face);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1968
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1969 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
1970 ERROR_ME_DEBUG_WARN, 1);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1971 if (TEXT_IMAGE_INSTANCEP (instance))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1972 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1973 Lisp_Object string = XIMAGE_INSTANCE_TEXT_STRING (instance);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1974 face_index orig_findex = data->findex;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1975 Bytebpos orig_charpos = data->byte_charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1976 Bytebpos orig_start_col_enabled = data->byte_start_col_enabled;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1977
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1978 data->findex = findex;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1979 data->byte_start_col_enabled = 0;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1980 if (!allow_cursor)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1981 data->byte_charpos = 0;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
1982 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
1983 XSTRING_LENGTH (string), 0, 1);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1984 data->findex = orig_findex;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1985 data->byte_charpos = orig_charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1986 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
1987 return retval;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1988 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1989
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
1990 rb.findex = findex;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1991 rb.xpos = data->pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1992 rb.width = width;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1993 rb.charpos = 0; /* glyphs are never "at" anywhere */
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
1994 if (data->byte_endpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1995 /* #### is this necessary at all? */
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
1996 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
1997 data->byte_endpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1998 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1999 rb.endpos = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2000 rb.type = RUNE_DGLYPH;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2001 rb.object.dglyph.glyph = gb->glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2002 rb.object.dglyph.extent = gb->extent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2003 rb.object.dglyph.xoffset = xoffset;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2004 rb.object.dglyph.ascent = ascent;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2005 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
2006 a normal (textual) baseline. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2007
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2008 if (allow_cursor)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2009 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2010 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
2011 data->byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2012
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2013 if (data->cursor_type == CURSOR_ON)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2014 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2015 if (data->byte_charpos == data->byte_cursor_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2016 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2017 rb.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2018 data->cursor_x = Dynarr_length (data->db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2019 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2020 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2021 rb.cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2022 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2023 else if (data->cursor_type == NEXT_CURSOR)
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 data->cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2028 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2029 else if (data->cursor_type == IGNORE_CURSOR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2030 rb.cursor_type = IGNORE_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2031 else if (data->cursor_type == NO_CURSOR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2032 rb.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2033 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2034 rb.cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2035 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2036 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2037 rb.cursor_type = CURSOR_OFF;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2038
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2039 Dynarr_add (data->db->runes, rb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2040 data->pixpos += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2041
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2042 return retval;
428
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 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2046 if (!NILP (glyph_face (gb->glyph, data->window)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2047 gb->findex =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2048 get_builtin_face_cache_index (w, glyph_face (gb->glyph,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2049 data->window));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2050 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2051 gb->findex = data->findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2052
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2053 if (pos_type == BEGIN_GLYPHS)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2054 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2055 if (!data->dl->left_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2056 data->dl->left_glyphs = Dynarr_new (glyph_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2057 Dynarr_add (data->dl->left_glyphs, *gb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2058 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2059 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2060 else if (pos_type == END_GLYPHS)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2061 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2062 if (!data->dl->right_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2063 data->dl->right_glyphs = Dynarr_new (glyph_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2064 Dynarr_add (data->dl->right_glyphs, *gb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2065 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2066 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2067 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2068 abort (); /* there are no unknown types */
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
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2071 return NULL;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2072 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2073
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2074 /* 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
2075 data. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2076
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2077 static prop_block_dynarr *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2078 add_glyph_runes (pos_data *data, int pos_type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2079 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2080 /* #### This still needs to handle the start_col parameter. Duh, Chuck,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2081 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
2082 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2083 glyph_block_dynarr *glyph_arr = (pos_type == BEGIN_GLYPHS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2084 ? data->ef->begin_glyphs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2085 : data->ef->end_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2086 prop_block_dynarr *prop;
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 for (elt = 0; elt < Dynarr_length (glyph_arr); elt++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2089 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2090 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
2091 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2092
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2093 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2094 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2095 /* #### Add some propagation information. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2096 return prop;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2099
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2100 Dynarr_reset (glyph_arr);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2101
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2102 return NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2103 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2104
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2105 /* 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
2106 display line DL accurately represents the text on a line starting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2107 at the given position.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2108
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2109 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
2110 You must do appropriate conversion. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2111
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
2112 static Bytebpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2113 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
2114 Bytebpos byte_start_pos, prop_block_dynarr **prop,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2115 int type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2116 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2117 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2118 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2119 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2120
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2121 pos_data data;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2122
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2123 /* 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
2124 a selected frame. We consider all other windows to be active
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2125 minibuffers as it simplifies the coding. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2126 int active_minibuffer = (!MINI_WINDOW_P (w) ||
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2127 (f == device_selected_frame (d)) ||
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2128 is_surrogate_for_selected_frame (f));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2129
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2130 int truncate_win = window_truncation_on (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2131
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2132 /* If the buffer's value of selective_display is an integer then
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2133 only lines that start with less than selective_display columns of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2134 space will be displayed. If selective_display is t then all text
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2135 after a ^M is invisible. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2136 int selective = (INTP (b->selective_display)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2137 ? XINT (b->selective_display)
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
2138 : (!NILP (b->selective_display) ? -1 : 0));
428
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 /* The variable ctl-arrow allows the user to specify what characters
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2141 can actually be displayed and which octal should be used for.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2142 #### This variable should probably have some rethought done to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2143 it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2144
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2145 #### It would also be really nice if you could specify that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2146 the characters come out in hex instead of in octal. Mule
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2147 does that by adding a ctl-hexa variable similar to ctl-arrow,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2148 but that's bogus -- we need a more general solution. I
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2149 think you need to extend the concept of display tables
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2150 into a more general conversion mechanism. Ideally you
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2151 could specify a Lisp function that converts characters,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2152 but this violates the Second Golden Rule and besides would
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2153 make things way way way way slow.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2154
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2155 So instead, we extend the display-table concept, which was
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2156 historically limited to 256-byte vectors, to one of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2157 following:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2158
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2159 a) A 256-entry vector, for backward compatibility;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2160 b) char-table, mapping characters to values;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2161 c) range-table, mapping ranges of characters to values;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2162 d) a list of the above.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2163
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2164 The (d) option allows you to specify multiple display tables
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2165 instead of just one. Each display table can specify conversions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2166 for some characters and leave others unchanged. The way the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2167 character gets displayed is determined by the first display table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2168 with a binding for that character. This way, you could call a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2169 function `enable-hex-display' that adds a hex display-table to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2170 the list of display tables for the current buffer.
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 #### ...not yet implemented... Also, we extend the concept of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2173 "mapping" to include a printf-like spec. Thus you can make all
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2174 extended characters show up as hex with a display table like
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2175 this:
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 #s(range-table data ((256 524288) (format "%x")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2178
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2179 Since more than one display table is possible, you have
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2180 great flexibility in mapping ranges of characters. */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2181 Ichar printable_min = (CHAR_OR_CHAR_INTP (b->ctl_arrow)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2182 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2183 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2184 ? 255 : 160));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2185
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2186 Lisp_Object face_dt, window_dt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2187
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2188 /* The text display block for this display line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2189 struct display_block *db = get_display_block_from_line (dl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2190
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2191 /* 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
2192 data to be updated. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2193 int initial = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2194
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2195 /* Apparently the new extent_fragment_update returns an end position
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2196 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
2197 displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2198 int no_more_frags = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2199
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2200 Lisp_Object synch_minibuffers_value =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2201 symbol_value_in_buffer (Qsynchronize_minibuffers, w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2202
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2203 dl->used_prop_data = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2204 dl->num_chars = 0;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2205 dl->line_continuation = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2206
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2207 xzero (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2208 data.ef = extent_fragment_new (w->buffer, f);
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 /* 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
2211 them to this structure for ease of passing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2212 data.d = d;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
2213 data.window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2214 data.string = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2215 data.db = db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2216 data.dl = dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2217
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2218 data.byte_charpos = byte_start_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2219 data.pixpos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2220 data.last_charset = Qunbound;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2221 data.last_findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2222 data.result_str = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2223
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2224 /* Set the right boundary adjusting it to take into account any end
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2225 glyph. Save the width of the end glyph for later use. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2226 data.max_pixpos = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2227 if (truncate_win)
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2228 data.end_glyph_width = GLYPH_CACHEL_WIDTH (w, TRUN_GLYPH_INDEX);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2229 else
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2230 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
2231 data.max_pixpos -= data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2232
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2233 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
2234 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2235 data.byte_cursor_charpos = BYTE_BUF_ZV (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2236 data.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2237 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2238 else if (MINI_WINDOW_P (w) && !active_minibuffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2239 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2240 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2241 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2242 d == XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d))))&&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2243 f == XFRAME(DEVICE_SELECTED_FRAME(d)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2244 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2245 data.byte_cursor_charpos = BYTE_BUF_PT (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2246 data.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2247 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2248 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2249 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2250 data.byte_cursor_charpos = byte_marker_position (w->pointm[type]);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2251 data.cursor_type = CURSOR_ON;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2252 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2253 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2254 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2255 data.cursor_x = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2256
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2257 data.start_col = w->hscroll;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2258 data.start_col_xoffset = w->left_xoffset;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2259 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2260 data.hscroll_glyph_width_adjust = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2261
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2262 /* We regenerate the line from the very beginning. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2263 Dynarr_reset (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2264
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2265 /* 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
2266 starting position is already equal to the maximum we can't add
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2267 anything else, right? Wrong. We might still have a newline to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2268 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
2269 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
2270 glyph. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2271
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2272 /* #### Chuck -- I think this condition should be while (1).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2273 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
2274 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
2275 end-glyph and text might not be displayed. while (1) ensures
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2276 that the loop terminates only when either (a) there is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2277 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
2278
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2279 #### Also I think you need to ensure that the operation
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2280 "add begin glyphs; add end glyphs; add text" is atomic and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2281 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
2282 of the line during that operation, then you keep accumulating
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2283 propagation data until you're done. Otherwise, if the (e.g.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2284 there's a begin glyph at a particular position and attempting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2285 to display that glyph results in window-end being hit and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2286 propagation data being generated, then the character at that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2287 position won't be displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2288
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2289 #### See also the comment after the end of this loop, below.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2290 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2291 while (data.pixpos <= data.max_pixpos
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2292 && (active_minibuffer || !NILP (synch_minibuffers_value)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2293 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2294 /* #### This check probably should not be necessary. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2295 if (data.byte_charpos > BYTE_BUF_ZV (b))
428
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 /* #### urk! More of this lossage! */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2298 data.byte_charpos--;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2299 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2300 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2301
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2302 /* If selective display was an integer and we aren't working on
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2303 a continuation line then find the next line we are actually
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2304 supposed to display. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2305 if (selective > 0
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2306 && (data.byte_charpos == BYTE_BUF_BEGV (b)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2307 || 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
2308 {
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2309 while (byte_spaces_at_point (b, data.byte_charpos) >= selective)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2310 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2311 data.byte_charpos =
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2312 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
2313 if (data.byte_charpos >= BYTE_BUF_ZV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2314 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2315 data.byte_charpos = BYTE_BUF_ZV (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2316 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2317 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2318 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2319 }
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 /* Check for face changes. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2322 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2323 {
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2324 Lisp_Object last_glyph = Qnil;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2325
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2326 /* 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
2327 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
2328 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
2329 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
2330 works because we always recalculate the extent-fragments
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2331 for propagated data, we never actually propagate the
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2332 fragments that still need to be displayed. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2333 if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2334 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2335 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
2336 Dynarr_free (*prop);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2337 *prop = 0;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2338 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2339 /* Now compute the face and begin/end-glyph information. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2340 data.findex =
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
2341 /* 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
2342 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2343
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2344 get_display_tables (w, data.findex, &face_dt, &window_dt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2345
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2346 if (data.byte_charpos == data.ef->end)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2347 no_more_frags = 1;
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 initial = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2350
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2351 /* Determine what is next to be displayed. We first handle any
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
2352 glyphs returned by glyphs_at_charbpos. If there are no glyphs to
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2353 display then we determine what to do based on the character at the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2354 current buffer position. */
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 /* If the current position is covered by an invisible extent, do
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2357 nothing (except maybe add some ellipses).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2358
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2359 #### The behavior of begin and end-glyphs at the edge of an
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2360 invisible extent should be investigated further. This is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2361 fairly low priority though. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2362 if (data.ef->invisible)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2363 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2364 /* #### Chuck, perhaps you could look at this code? I don't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2365 really know what I'm doing. */
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 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2368 Dynarr_free (*prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2369 *prop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2370 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2371
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2372 /* The extent fragment code only sets this when we should
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2373 really display the ellipses. It makes sure the ellipses
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2374 don't get displayed more than once in a row. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2375 if (data.ef->invisible_ellipses)
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 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2378
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2379 data.ef->invisible_ellipses_already_displayed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2380 data.ef->invisible_ellipses = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2381 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2382 gb.glyph = Vinvisible_text_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2383 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2384 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2385 /* Perhaps they shouldn't propagate if the very next thing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2386 is to display a newline (for compatibility with
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2387 selective-display-ellipses)? Maybe that's too
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2388 abstruse. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2389 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2390 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2391 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2392
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2393 /* If point is in an invisible region we place it on the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2394 next visible character. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2395 if (data.cursor_type == CURSOR_ON
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2396 && data.byte_charpos == data.byte_cursor_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2397 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2398 data.cursor_type = NEXT_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2399 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2400
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2401 /* #### What if we we're dealing with a display table? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2402 if (data.start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2403 data.start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2404
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2405 if (data.byte_charpos == BYTE_BUF_ZV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2406 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2407 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2408 INC_BYTEBPOS (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2409 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2410
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2411 /* 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
2412 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
2413 position counter. This might also add the minibuffer
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2414 prompt. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2415 else if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2416 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2417 dl->used_prop_data = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2418 *prop = add_propagation_runes (prop, &data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2419
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2420 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2421 goto done; /* gee, a really narrow window */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2422 else if (data.byte_charpos == BYTE_BUF_ZV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2423 goto done;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2424 else if (data.byte_charpos < BYTE_BUF_BEGV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2425 /* #### 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
2426 data.byte_charpos = BYTE_BUF_BEGV (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2427 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2428 INC_BYTEBPOS (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2429 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2430
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2431 /* If there are end glyphs, add them to the line. These are
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2432 the end glyphs for the previous run of text. We add them
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2433 here rather than doing them at the end of handling the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2434 previous run so that glyphs at the beginning and end of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2435 a line are handled correctly. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2436 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
2437 || Dynarr_length (data.ef->begin_glyphs) > 0)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2438 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2439 glyph_block_dynarr* tmpglyphs = 0;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2440 /* #### 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
2441 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
2442
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2443 if (Dynarr_length (data.ef->end_glyphs) > 0)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2444 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2445 *prop = add_glyph_runes (&data, END_GLYPHS);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2446 tmpglyphs = data.ef->end_glyphs;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2447 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2448
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2449 /* If there are begin glyphs, add them to the line. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2450 if (!*prop && Dynarr_length (data.ef->begin_glyphs) > 0)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2451 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2452 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2453 tmpglyphs = data.ef->begin_glyphs;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2454 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2455
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2456 if (*prop)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2457 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2458 /* 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
2459 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
2460 appropriate processing to not get a continuation
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2461 glyph. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2462 if (*prop != ADD_FAILED
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2463 && Dynarr_atp (*prop, 0)->type == PROP_GLYPH
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2464 && data.ch == '\n')
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2465 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2466 /* If there are no more glyphs then do the normal
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2467 processing.
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2468
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2469 #### 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
2470 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
2471 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
2472 which might be problematic since the fragment is
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2473 recalculated for each line. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2474 if (EQ (Dynarr_end (tmpglyphs)->glyph,
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2475 Dynarr_atp (*prop, 0)->data.p_glyph.glyph))
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2476 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2477 Dynarr_free (*prop);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2478 *prop = 0;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2479 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2480 else {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2481 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
2482 add_ichar_rune (&data); /* discard prop data. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2483 goto done;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2484 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2485 }
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2486 else
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2487 goto done;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2488 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2489 }
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 /* If at end-of-buffer, we've already processed begin and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2492 end-glyphs at this point and there's no text to process,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2493 so we're done. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2494 else if (data.byte_charpos == BYTE_BUF_ZV (b))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2495 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2496
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2497 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2498 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2499 Lisp_Object entry = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2500 /* 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
2501 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2502 if (!NILP (face_dt) || !NILP (window_dt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2503 entry = display_table_entry (data.ch, face_dt, window_dt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2504
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2505 /* If there is a display table entry for it, hand it off to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2506 add_disp_table_entry_runes and let it worry about it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2507 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2508 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2509 *prop = add_disp_table_entry_runes (&data, entry);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2510
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2511 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2512 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2513 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2514
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2515 /* Check if we have hit a newline character. If so, add a marker
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2516 to the line and end this loop. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2517 else if (data.ch == '\n')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2518 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2519 /* We aren't going to be adding an end glyph so give its
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2520 space back in order to make sure that the cursor can
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2521 fit. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2522 data.max_pixpos += data.end_glyph_width;
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 if (selective > 0
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2525 && (byte_spaces_at_point
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2526 (b, next_bytebpos (b, data.byte_charpos))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2527 >= selective))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2528 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2529 if (!NILP (b->selective_display_ellipses))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2530 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2531 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2532
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2533 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2534 gb.glyph = Vinvisible_text_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2535 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2536 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2537 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2538 else
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 /* Cheesy, cheesy, cheesy. We mark the end of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2541 line with a special "character rune" whose width
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2542 is the EOL cursor width and whose character is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2543 the non-printing character '\n'. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2544 data.blank_width = DEVMETH (d, eol_cursor_width, ());
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2545 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2546 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2547
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2548 /* We need to set data.byte_charpos to the start of the
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2549 next visible region in order to make this line
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2550 appear to contain all of the invisible area.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2551 Otherwise, the line cache won't work
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2552 correctly. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2553 INC_BYTEBPOS (b, data.byte_charpos);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2554 while (byte_spaces_at_point (b, data.byte_charpos) >= selective)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2555 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2556 data.byte_charpos =
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2557 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
2558 if (data.byte_charpos >= BYTE_BUF_ZV (b))
428
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 data.byte_charpos = BYTE_BUF_ZV (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2561 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2562 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2563 }
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2564 if (BYTE_BUF_FETCH_CHAR
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2565 (b, prev_bytebpos (b, data.byte_charpos)) == '\n')
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2566 DEC_BYTEBPOS (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2567 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2568 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2569 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2570 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
2571 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2572 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2573
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2574 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2575 }
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 /* If the current character is ^M, and selective display is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2578 enabled, then add the invisible-text-glyph if
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2579 selective-display-ellipses is set. In any case, this
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2580 line is done. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2581 else if (data.ch == (('M' & 037)) && selective == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2582 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2583 Bytebpos byte_next_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2584
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2585 /* 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
2586 byte_next_charpos =
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2587 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
2588 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
2589 == '\n')
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2590 DEC_BYTEBPOS (b, byte_next_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2591
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2592 /* If the cursor is somewhere in the elided text make
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2593 sure that the cursor gets drawn appropriately. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2594 if (data.cursor_type == CURSOR_ON
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2595 && (data.byte_cursor_charpos >= data.byte_charpos &&
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2596 data.byte_cursor_charpos < byte_next_charpos))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2597 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2598 data.cursor_type = NEXT_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2599 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2600
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2601 /* We won't be adding a truncation or continuation glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2602 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
2603 data.max_pixpos += data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2604
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2605 if (!NILP (b->selective_display_ellipses))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2606 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2607 /* We don't propagate anything from the invisible
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2608 text glyph if it fails to fit. This is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2609 intentional. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2610 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2611
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2612 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2613 gb.glyph = Vinvisible_text_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2614 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 1,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2615 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2616 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2617
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2618 /* Set the buffer position to the end of the line. We
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2619 need to do this before potentially adding a newline
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2620 so that the cursor flag will get set correctly (if
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2621 needed). */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2622 data.byte_charpos = byte_next_charpos;
428
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 (NILP (b->selective_display_ellipses)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2625 || data.byte_cursor_charpos == byte_next_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2626 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2627 /* We have to at least add a newline character so
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2628 that the cursor shows up properly. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2629 data.ch = '\n';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2630 data.blank_width = DEVMETH (d, eol_cursor_width, ());
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2631 data.findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2632 data.start_col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2633 data.start_col_xoffset = 0;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2634 data.byte_start_col_enabled = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2635
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2636 add_ichar_rune (&data);
428
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2639 /* This had better be a newline but doing it this way
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2640 we'll see obvious incorrect results if it isn't. No
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2641 need to abort here. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2642 data.ch = BYTE_BUF_FETCH_CHAR (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2643
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2644 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2645 }
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 /* If the current character is considered to be printable, then
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2648 just add it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2649 else if (data.ch >= printable_min)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2650 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2651 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2652 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2653 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2654 }
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 /* If the current character is a tab, determine the next tab
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2657 starting position and add a blank rune which extends from the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2658 current pixel position to that starting position. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2659 else if (data.ch == '\t')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2660 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2661 int tab_start_pixpos = data.pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2662 int next_tab_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2663 int char_tab_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2664 int prop_width = 0;
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 (data.start_col > 1)
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
2667 tab_start_pixpos -= (space_width (w) * (data.start_col - 1))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2668 + data.start_col_xoffset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2669
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2670 next_tab_start =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2671 next_tab_position (w, tab_start_pixpos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2672 dl->bounds.left_in +
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2673 data.hscroll_glyph_width_adjust);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2674 if (next_tab_start > data.max_pixpos)
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 prop_width = next_tab_start - data.max_pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2677 next_tab_start = data.max_pixpos;
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 data.blank_width = next_tab_start - data.pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2680 char_tab_width =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2681 (next_tab_start - tab_start_pixpos) / space_width (w);
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 *prop = add_blank_rune (&data, w, char_tab_width);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2684
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2685 /* add_blank_rune is only supposed to be called with
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2686 sizes guaranteed to fit in the available space. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2687 assert (!(*prop));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2688
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2689 if (prop_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2690 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2691 struct prop_block pb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2692 *prop = Dynarr_new (prop_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2693
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2694 pb.type = PROP_BLANK;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2695 pb.data.p_blank.width = prop_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2696 pb.data.p_blank.findex = data.findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2697 Dynarr_add (*prop, pb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2698
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2699 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2700 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2701 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2702
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2703 /* If character is a control character, pass it off to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2704 add_control_char_runes.
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 The is_*() routines have undefined results on
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2707 arguments outside of the range [-1, 255]. (This
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2708 often bites people who carelessly use `char' instead
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2709 of `unsigned char'.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2710 */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2711 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2712 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2713 *prop = add_control_char_runes (&data, b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2714
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2715 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2716 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2717 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2718
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2719 /* If the character is above the ASCII range and we have not
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2720 already handled it, then print it as an octal number. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2721 else if (data.ch >= 0200)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2722 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2723 *prop = add_octal_runes (&data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2724
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2725 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2726 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2727 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2728
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2729 /* Assume the current character is considered to be printable,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2730 then just add it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2731 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2732 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2733 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2734 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2735 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2736 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2737
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2738 INC_BYTEBPOS (b, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2739 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2740 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2741
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2742 done:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2743
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2744 /* 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
2745 end of the buffer. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2746 if (data.byte_charpos < BYTE_BUF_ZV (b)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2747 && (active_minibuffer || !NILP (synch_minibuffers_value)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2748 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2749 /* #### This check is not correct. If the line terminated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2750 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
2751 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
2752 you make the two changes mentioned at the top of this loop,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2753 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
2754 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
2755 check. */
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 /* The common case is that the line ended because we hit a newline.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2758 In that case, the next character is just the next buffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2759 position. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2760 if (data.ch == '\n')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2761 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2762 /* If data.start_col_enabled is still true, then the window is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2763 scrolled far enough so that nothing on this line is visible.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2764 We need to stick a truncation glyph at the beginning of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2765 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
2766 if (data.byte_start_col_enabled)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2767 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2768 if (data.cursor_type == CURSOR_ON)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2769 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2770 if (data.byte_cursor_charpos >= byte_start_pos
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2771 && data.byte_cursor_charpos <= data.byte_charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2772 data.byte_cursor_charpos = data.byte_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2773 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2774 data.findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2775 data.start_col = 0;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2776 data.byte_start_col_enabled = 0;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2777
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2778 if (data.byte_charpos != byte_start_pos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2779 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2780 struct glyph_block gb;
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 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2783 gb.glyph = Vhscroll_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2784 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2785 GLYPH_CACHEL (w, HSCROLL_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2786 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2787 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2788 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2789 /* This duplicates code down below to add a newline to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2790 the end of an otherwise empty line.*/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2791 data.ch = '\n';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2792 data.blank_width = DEVMETH (d, eol_cursor_width, ());
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2793
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2794 add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2795 }
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
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2798 INC_BYTEBPOS (b, data.byte_charpos);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2801 /* Otherwise we have a buffer line which cannot fit on one display
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2802 line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2803 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2804 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2805 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2806 struct glyph_cachel *cachel;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2807
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2808 /* If the line is to be truncated then we actually have to look
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2809 for the next newline. We also add the end-of-line glyph which
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2810 we know will fit because we adjusted the right border before
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2811 we starting laying out the line. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2812 data.max_pixpos += data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2813 data.findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2814 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2815
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2816 if (truncate_win)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2817 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2818 Bytebpos byte_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2819
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2820 /* 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
2821 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
2822
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2823 /* If the cursor is past the truncation line then we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2824 make it appear on the truncation glyph. If we've hit
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2825 the end of the buffer then we also make the cursor
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2826 appear unless eob is immediately preceded by a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2827 newline. In that case the cursor should actually
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2828 appear on the next line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2829 if (data.cursor_type == CURSOR_ON
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2830 && data.byte_cursor_charpos >= data.byte_charpos
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2831 && (data.byte_cursor_charpos < byte_pos ||
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2832 (byte_pos == BYTE_BUF_ZV (b)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2833 && (byte_pos == BYTE_BUF_BEGV (b)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2834 || (BYTE_BUF_FETCH_CHAR (b, prev_bytebpos (b, byte_pos))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2835 != '\n')))))
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2836 data.byte_cursor_charpos = byte_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2837 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2838 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2839
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2840 data.byte_charpos = byte_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2841 gb.glyph = Vtruncation_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2842 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2845 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2846 /* The cursor can never be on the continuation glyph. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2847 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2848
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2849 /* 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
2850
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2851 dl->line_continuation = 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2852 gb.glyph = Vcontinuation_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2853 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2854 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2855
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
2856 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2857
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2858 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
2859 && 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
2860 /* #### Damn this losing shit. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2861 data.byte_charpos++;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2862 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2863 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2864 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
2865 && (!echo_area_active (f) || data.byte_charpos == BYTE_BUF_ZV (b)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2866 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2867 /* We need to add a marker to the end of the line since there is no
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2868 newline character in order for the cursor to get drawn. We label
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2869 it as a newline so that it gets handled correctly by the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2870 whitespace routines below. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2871
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2872 data.ch = '\n';
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2873 data.blank_width = DEVMETH (d, eol_cursor_width, ());
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2874 data.findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2875 data.start_col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2876 data.start_col_xoffset = 0;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2877 data.byte_start_col_enabled = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2878
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2879 data.max_pixpos += data.blank_width;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
2880 add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2881 data.max_pixpos -= data.blank_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2882
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2883 /* #### urk! Chuck, this shit is bad news. Going around
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2884 manipulating invalid positions is guaranteed to result in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2885 trouble sooner or later. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2886 data.byte_charpos = BYTE_BUF_ZV (b) + 1;
428
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2889 /* Calculate left whitespace boundary. */
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 int 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 /* Whitespace past a newline is considered right whitespace. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2894 while (elt < Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2895 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2896 struct rune *rb = Dynarr_atp (db->runes, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2897
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2898 if ((rb->type == RUNE_CHAR && rb->object.chr.ch == ' ')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2899 || rb->type == RUNE_BLANK)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2900 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2901 dl->bounds.left_white += rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2902 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2903 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2904 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2905 elt = Dynarr_length (db->runes);
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2908
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2909 /* Calculate right whitespace boundary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2910 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2911 int elt = Dynarr_length (db->runes) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2912 int done = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2913
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2914 while (!done && elt >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2915 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2916 struct rune *rb = Dynarr_atp (db->runes, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2917
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2918 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2919 && isspace (rb->object.chr.ch))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2920 && !rb->type == RUNE_BLANK)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2921 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2922 dl->bounds.right_white = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2923 done = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2924 }
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 elt--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2927
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 /* The line is blank so everything is considered to be right
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2931 whitespace. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2932 if (!done)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2933 dl->bounds.right_white = dl->bounds.left_in;
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 /* Set the display blocks bounds. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2937 db->start_pos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2938 if (Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2939 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2940 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2941
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2942 db->end_pos = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2943 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2944 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2945 db->end_pos = dl->bounds.right_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2946
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2947 calculate_baseline (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2948
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2949 dl->ascent = data.new_ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2950 dl->descent = data.new_descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2951
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2952 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2953 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2954
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2955 if (dl->ascent < ascent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2956 dl->ascent = ascent;
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 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2959 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
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 if (dl->descent < descent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2962 dl->descent = descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2963 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2964
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2965 calculate_yoffset (dl, db);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
2966
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2967 dl->cursor_elt = data.cursor_x;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2968 /* #### lossage lossage lossage! Fix this shit! */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2969 if (data.byte_charpos > BYTE_BUF_ZV (b))
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2970 dl->end_charpos = BUF_ZV (b);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2971 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2972 dl->end_charpos = bytebpos_to_charbpos (b, data.byte_charpos) - 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2973 if (truncate_win)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
2974 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
2975 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2976 /* This doesn't correctly take into account tabs and control
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2977 characters but if the window isn't being truncated then this
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2978 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
2979 data.dl->num_chars = dl->end_charpos - dl->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2980
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2981 /* #### handle horizontally scrolled line with text none of which
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2982 was actually laid out. */
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 /* #### handle any remainder of overlay arrow */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2985
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2986 if (*prop == ADD_FAILED)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2987 *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2988
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2989 if (truncate_win && *prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2990 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2991 Dynarr_free (*prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2992 *prop = NULL;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2995 extent_fragment_delete (data.ef);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2996
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2997 /* #### 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
2998 it so that regenerate_window will exit properly. This is bogus.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2999 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
3000 this function if we are already at EOB. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3001
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
3002 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
3003 return data.byte_charpos + 1; /* Yuck! */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3004 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
3005 return data.byte_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3006 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3007
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3008 /* Display the overlay arrow at the beginning of the given line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3009
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3010 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3011 create_overlay_glyph_block (struct window *w, struct display_line *dl)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3012 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3013 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3014 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3015 pos_data data;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3016
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3017 /* If Voverlay_arrow_string isn't valid then just fail silently. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3018 if (!STRINGP (Voverlay_arrow_string) && !GLYPHP (Voverlay_arrow_string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3019 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3020
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3021 xzero (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3022 data.ef = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3023 data.d = d;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3024 data.window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3025 data.db = get_display_block_from_line (dl, OVERWRITE);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3026 data.dl = dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3027 data.pixpos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3028 data.max_pixpos = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3029 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3030 data.cursor_x = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3031 data.findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3032 data.last_charset = Qunbound;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3033 data.last_findex = DEFAULT_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3034 data.result_str = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3035 data.string = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3036
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3037 Dynarr_reset (data.db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3038
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3039 if (STRINGP (Voverlay_arrow_string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3040 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
3041 add_ibyte_string_runes
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3042 (&data,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3043 XSTRING_DATA (Voverlay_arrow_string),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3044 XSTRING_LENGTH (Voverlay_arrow_string),
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3045 1, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3046 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3047 else if (GLYPHP (Voverlay_arrow_string))
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 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3050
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3051 gb.glyph = Voverlay_arrow_string;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3052 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3053 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3054 }
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3055
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3056 if (data.max_pixmap_height)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3057 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3058 int height = data.new_ascent + data.new_descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3059 int pix_ascent, pix_descent;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3060
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3061 pix_descent = data.max_pixmap_height * data.new_descent / height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3062 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
3063 calculate_baseline (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3064
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3065 data.new_ascent = max (data.new_ascent, pix_ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3066 data.new_descent = max (data.new_descent, pix_descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3067 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3068
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3069 dl->ascent = data.new_ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3070 dl->descent = data.new_descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3071
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3072 data.db->start_pos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3073 data.db->end_pos = data.pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3074
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3075 calculate_yoffset (dl, data.db);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3076
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3077 return data.pixpos - dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3078 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3079
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3080 /* Add a type of glyph to a margin display block. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3081
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3082 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3083 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
3084 int count, enum glyph_layout layout, int side, Lisp_Object window)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3085 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3086 glyph_block_dynarr *gbd = (side == LEFT_GLYPHS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3087 ? dl->left_glyphs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3088 : dl->right_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3089 int elt, end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3090 int reverse;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3091 struct window *w = XWINDOW (window);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3092 struct frame *f = XFRAME (w->frame);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3093 struct device *d = XDEVICE (f->device);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3094 pos_data data;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3095
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3096 xzero (data);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3097 data.d = d;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3098 data.window = window;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3099 data.db = db;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3100 data.dl = dl;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3101 data.pixpos = start;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3102 data.cursor_type = NO_CURSOR;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3103 data.cursor_x = -1;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3104 data.last_charset = Qunbound;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3105 data.last_findex = DEFAULT_INDEX;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3106 data.result_str = Qnil;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3107 data.string = Qnil;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3108 data.new_ascent = dl->ascent;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3109 data.new_descent = dl->descent;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3110
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3111 if ((layout == GL_WHITESPACE && side == LEFT_GLYPHS)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3112 || (layout == GL_INSIDE_MARGIN && side == RIGHT_GLYPHS))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3113 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3114 reverse = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3115 elt = Dynarr_length (gbd) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3116 end = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3117 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3118 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3119 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3120 reverse = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3121 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3122 end = Dynarr_length (gbd);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3125 while (count && ((!reverse && elt < end) || (reverse && elt >= end)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3126 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3127 struct glyph_block *gb = Dynarr_atp (gbd, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3128
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3129 if (NILP (gb->extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3130 abort (); /* these should have been handled in add_glyph_rune */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3131
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3132 if (gb->active &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3133 ((side == LEFT_GLYPHS &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3134 extent_begin_glyph_layout (XEXTENT (gb->extent)) == layout)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3135 || (side == RIGHT_GLYPHS &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3136 extent_end_glyph_layout (XEXTENT (gb->extent)) == layout)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3137 {
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3138 data.findex = gb->findex;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3139 data.max_pixpos = data.pixpos + gb->width;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3140 add_glyph_rune (&data, gb, side, 0, NULL);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3141 count--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3142 gb->active = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3143 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3144
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3145 (reverse ? elt-- : elt++);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3146 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3147
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3148 calculate_baseline (&data);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3149
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3150 dl->ascent = data.new_ascent;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3151 dl->descent = data.new_descent;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3152
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3153 calculate_yoffset (dl, data.db);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
3154
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3155 return data.pixpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3156 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3157
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3158 /* Add a blank to a margin display block. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3159
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3160 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3161 add_margin_blank (struct display_line *dl, struct display_block *db,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3162 struct window *w, int xpos, int width, int side)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3163 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3164 struct rune rb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3165
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3166 rb.findex = (side == LEFT_GLYPHS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3167 ? get_builtin_face_cache_index (w, Vleft_margin_face)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3168 : get_builtin_face_cache_index (w, Vright_margin_face));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3169 rb.xpos = xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3170 rb.width = width;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
3171 rb.charpos = -1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3172 rb.endpos = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3173 rb.type = RUNE_BLANK;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3174 rb.cursor_type = CURSOR_OFF;
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 Dynarr_add (db->runes, rb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3177 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3178
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3179 /* Display glyphs in the left outside margin, left inside margin and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3180 left whitespace area. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3181
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3182 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3183 create_left_glyph_block (struct window *w, struct display_line *dl,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3184 int overlay_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3185 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3186 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3187
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3188 int use_overflow = (NILP (w->use_left_overflow) ? 0 : 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3189 int elt, end_xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3190 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
3191 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
3192 int left_in_start = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3193 int left_in_end = dl->bounds.left_in + overlay_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3194
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3195 struct display_block *odb, *idb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3196
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3197 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3198
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3199 /* 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
3200 inside, whitespace. However the precedence dictates that we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3201 determine how many will fit in the reverse order. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3202
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3203 /* Determine how many whitespace glyphs we can display and where
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3204 they should start. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3205 white_in_start = dl->bounds.left_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3206 white_out_start = left_in_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3207 white_out_cnt = white_in_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3208 elt = 0;
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 while (elt < Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3211 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3212 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3213
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3214 if (NILP (gb->extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3215 abort (); /* these should have been handled in add_glyph_rune */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3216
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3217 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
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 int width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3220
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3221 width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3222
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3223 if (white_in_start - width >= left_in_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3224 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3225 white_in_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3226 white_in_start -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3227 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3228 gb->active = 1;
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 else if (use_overflow
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3231 && (white_out_start - width > dl->bounds.left_out))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3232 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3233 white_out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3234 white_out_start -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3235 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3236 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3237 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3238 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3239 gb->active = 0;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3242 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3243 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3244
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3245 /* Determine how many inside margin glyphs we can display and where
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3246 they should start. The inside margin glyphs get whatever space
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3247 is left after the whitespace glyphs have been displayed. These
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3248 are tricky to calculate since if we decide to use the overflow
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3249 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
3250 list of just the inside margin glyphs and manipulate it to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3251 determine the needed info. */
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 glyph_block_dynarr *ib;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3254 int avail_in, avail_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3255 int done = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3256 int marker = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3257 int used_in, used_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3258
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3259 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3260 used_in = used_out = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3261 ib = Dynarr_new (glyph_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3262 while (elt < Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3263 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3264 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
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 (NILP (gb->extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3267 abort (); /* these should have been handled in add_glyph_rune */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3268
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3269 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3270 GL_INSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3271 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3272 gb->width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3273 used_in += gb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3274 Dynarr_add (ib, *gb);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3277 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3278 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3279
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3280 if (white_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3281 avail_in = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3282 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3283 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3284 avail_in = white_in_start - left_in_end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3285 if (avail_in < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3286 avail_in = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3287 }
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 if (!use_overflow)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3290 avail_out = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3291 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3292 avail_out = white_out_start - dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3293
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3294 marker = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3295 while (!done && marker < Dynarr_length (ib))
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 int width = Dynarr_atp (ib, marker)->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3298
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3299 /* If everything now fits in the available inside margin
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3300 space, we're done. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3301 if (used_in <= avail_in)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3302 done = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3303 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3304 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3305 /* Otherwise see if we have room to move a glyph to the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3306 outside. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3307 if (used_out + width <= avail_out)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3308 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3309 used_out += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3310 used_in -= width;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3313 done = 1;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3316 if (!done)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3317 marker++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3318 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3319
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3320 /* 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
3321 the inside margin and everything before it goes in the outside
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3322 margin. The stuff going into the outside margin is guaranteed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3323 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
3324
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3325 in_in_end = left_in_end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3326 in_out_start = white_out_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3327 in_out_cnt = in_in_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3328
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3329 Dynarr_free (ib);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3330 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3331 while (elt < Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3332 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3333 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
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 if (NILP (gb->extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3336 abort (); /* these should have been handled in add_glyph_rune */
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 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3339 GL_INSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3340 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3341 int width = glyph_width (gb->glyph, window);
428
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 if (used_out)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3344 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3345 in_out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3346 in_out_start -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3347 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3348 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3349 used_out -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3350 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3351 else if (in_in_end + width < white_in_start)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3352 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3353 in_in_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3354 in_in_end += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3355 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3356 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3357 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3358 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3359 gb->active = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3360 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3361
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3362 elt++;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3365
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3366 /* Determine how many outside margin glyphs we can display. They
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3367 always start at the left outside margin and can only use the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3368 outside margin space. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3369 out_end = dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3370 out_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3371 elt = 0;
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 while (elt < Dynarr_length (dl->left_glyphs))
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 struct glyph_block *gb = Dynarr_atp (dl->left_glyphs, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3376
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3377 if (NILP (gb->extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3378 abort (); /* these should have been handled in add_glyph_rune */
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 if (extent_begin_glyph_layout (XEXTENT (gb->extent)) ==
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3381 GL_OUTSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3382 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3383 int width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3384
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3385 if (out_end + width <= in_out_start)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3386 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3387 out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3388 out_end += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3389 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3390 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3391 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3392 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3393 gb->active = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3394 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3395
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3396 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3397 }
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 /* Now that we know where everything goes, we add the glyphs as
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3400 runes to the appropriate display blocks. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3401 if (out_cnt || in_out_cnt || white_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3402 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3403 odb = get_display_block_from_line (dl, LEFT_OUTSIDE_MARGIN);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3404 odb->start_pos = dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3405 /* #### We should stop adding a blank to account for the space
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3406 between the end of the glyphs and the margin and instead set
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3407 this accordingly. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3408 odb->end_pos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3409 Dynarr_reset (odb->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3410 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3411 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3412 odb = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3413
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3414 if (in_in_cnt || white_in_cnt)
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 idb = get_display_block_from_line (dl, LEFT_INSIDE_MARGIN);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3417 idb->start_pos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3418 /* #### See above comment for odb->end_pos */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3419 idb->end_pos = dl->bounds.left_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3420 Dynarr_reset (idb->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3421 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3422 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3423 idb = 0;
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 /* First add the outside margin glyphs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3426 if (out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3427 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
3428 GL_OUTSIDE_MARGIN, LEFT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3429 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3430 end_xpos = dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3431
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3432 /* There may be blank space between the outside margin glyphs and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3433 the inside margin glyphs. If so, add a blank. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3434 if (in_out_cnt && (in_out_start - end_xpos))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3435 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3436 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
3437 LEFT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3438 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3439
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3440 /* Next add the inside margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3441 outside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3442 if (in_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3443 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3444 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
3445 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3446 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3447
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3448 /* 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
3449 but are adding whitespace glyphs, then we need to add a blank
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3450 here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3451 if (!in_out_cnt && white_out_cnt && (white_out_start - end_xpos))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3452 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3453 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
3454 LEFT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3455 }
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 /* Next add the whitespace margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3458 outside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3459 if (white_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3460 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3461 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
3462 GL_WHITESPACE, LEFT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3463 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3464
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3465 /* 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
3466 start of the inside margin for lines which have glyphs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3467 if (odb && (left_in_start - end_xpos))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3468 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3469 add_margin_blank (dl, odb, w, end_xpos, left_in_start - end_xpos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3470 LEFT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3471 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3472
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3473 /* Next add the inside margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3474 inside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3475 if (in_in_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3476 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3477 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
3478 GL_INSIDE_MARGIN, LEFT_GLYPHS, window);
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3481 end_xpos = left_in_end;
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 /* Make sure that the area between the end of the inside margin
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3484 glyphs and the whitespace glyphs is cleared. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3485 if (idb && (white_in_start - end_xpos > 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3486 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3487 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
3488 LEFT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3489 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3490
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3491 /* Next add the whitespace margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3492 inside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3493 if (white_in_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3494 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3495 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
3496 LEFT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3497 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3498
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3499 /* Whitespace glyphs always end right next to the text block so
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3500 there is nothing we have to make sure is cleared after them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3501 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3502
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3503 /* Display glyphs in the right outside margin, right inside margin and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3504 right whitespace area. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3505
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3506 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3507 create_right_glyph_block (struct window *w, struct display_line *dl)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3508 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3509 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3510
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3511 int use_overflow = (NILP (w->use_right_overflow) ? 0 : 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3512 int elt, end_xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3513 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
3514 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
3515
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3516 struct display_block *odb, *idb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3517
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3518 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3519
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3520 /* 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
3521 inside, whitespace. However the precedence dictates that we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3522 determine how many will fit in the reverse order. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3523
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3524 /* Determine how many whitespace glyphs we can display and where
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3525 they should start. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3526 white_in_end = dl->bounds.right_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3527 white_out_end = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3528 white_out_cnt = white_in_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3529 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3530
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3531 while (elt < Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3532 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3533 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3534
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3535 if (NILP (gb->extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3536 abort (); /* these should have been handled in add_glyph_rune */
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 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_WHITESPACE)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3539 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3540 int width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3541
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3542 if (white_in_end + width <= dl->bounds.right_in)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3543 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3544 white_in_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3545 white_in_end += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3546 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3547 gb->active = 1;
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 else if (use_overflow
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3550 && (white_out_end + width <= dl->bounds.right_out))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3551 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3552 white_out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3553 white_out_end += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3554 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3555 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3556 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3557 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3558 gb->active = 0;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3561 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3562 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3563
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3564 /* Determine how many inside margin glyphs we can display and where
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3565 they should start. The inside margin glyphs get whatever space
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3566 is left after the whitespace glyphs have been displayed. These
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3567 are tricky to calculate since if we decide to use the overflow
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3568 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
3569 list of just the inside margin glyphs and manipulate it to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3570 determine the needed info. */
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 glyph_block_dynarr *ib;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3573 int avail_in, avail_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3574 int done = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3575 int marker = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3576 int used_in, used_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3577
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3578 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3579 used_in = used_out = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3580 ib = Dynarr_new (glyph_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3581 while (elt < Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3582 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3583 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
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 if (NILP (gb->extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3586 abort (); /* these should have been handled in add_glyph_rune */
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 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3589 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3590 gb->width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3591 used_in += gb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3592 Dynarr_add (ib, *gb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3593 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3594
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3595 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3596 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3597
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3598 if (white_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3599 avail_in = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3600 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3601 avail_in = dl->bounds.right_in - white_in_end;
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 if (!use_overflow)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3604 avail_out = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3605 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3606 avail_out = dl->bounds.right_out - white_out_end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3607
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3608 marker = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3609 while (!done && marker < Dynarr_length (ib))
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 int width = Dynarr_atp (ib, marker)->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3612
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3613 /* If everything now fits in the available inside margin
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3614 space, we're done. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3615 if (used_in <= avail_in)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3616 done = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3617 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3618 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3619 /* Otherwise see if we have room to move a glyph to the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3620 outside. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3621 if (used_out + width <= avail_out)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3622 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3623 used_out += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3624 used_in -= width;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3627 done = 1;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3630 if (!done)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3631 marker++;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3634 /* 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
3635 the inside margin and everything before it goes in the outside
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3636 margin. The stuff going into the outside margin is guaranteed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3637 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
3638
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3639 in_in_start = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3640 in_out_end = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3641 in_out_cnt = in_in_cnt = 0;
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 Dynarr_free (ib);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3644 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3645 while (elt < Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3646 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3647 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3648
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3649 if (NILP (gb->extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3650 abort (); /* these should have been handled in add_glyph_rune */
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 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_INSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3653 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3654 int width = glyph_width (gb->glyph, window);
428
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 if (used_out)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3657 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3658 in_out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3659 in_out_end += width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3660 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3661 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3662 used_out -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3663 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3664 else if (in_in_start - width >= white_in_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3665 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3666 in_in_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3667 in_in_start -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3668 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3669 gb->active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3670 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3671 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3672 gb->active = 0;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3675 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3676 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3677 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3678
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3679 /* Determine how many outside margin glyphs we can display. They
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3680 always start at the right outside margin and can only use the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3681 outside margin space. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3682 out_start = dl->bounds.right_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3683 out_cnt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3684 elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3685
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3686 while (elt < Dynarr_length (dl->right_glyphs))
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 struct glyph_block *gb = Dynarr_atp (dl->right_glyphs, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3689
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3690 if (NILP (gb->extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3691 abort (); /* these should have been handled in add_glyph_rune */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3692
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3693 if (extent_end_glyph_layout (XEXTENT (gb->extent)) == GL_OUTSIDE_MARGIN)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3694 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3695 int width = glyph_width (gb->glyph, window);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3696
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3697 if (out_start - width >= in_out_end)
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 out_cnt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3700 out_start -= width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3701 gb->width = width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3702 gb->active = 1;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3705 gb->active = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3706 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3707
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3708 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3709 }
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 /* 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
3712 to the appropriate display blocks. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3713 if (out_cnt || in_out_cnt || white_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3714 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3715 odb = get_display_block_from_line (dl, RIGHT_OUTSIDE_MARGIN);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3716 /* #### See comments before odb->start_pos init in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3717 create_left_glyph_block */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3718 odb->start_pos = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3719 odb->end_pos = dl->bounds.right_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3720 Dynarr_reset (odb->runes);
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 odb = 0;
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 if (in_in_cnt || white_in_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3726 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3727 idb = get_display_block_from_line (dl, RIGHT_INSIDE_MARGIN);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3728 idb->start_pos = dl->bounds.right_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3729 /* #### See comments before odb->start_pos init in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3730 create_left_glyph_block */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3731 idb->end_pos = dl->bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3732 Dynarr_reset (idb->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3733 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3734 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3735 idb = 0;
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 /* First add the whitespace margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3738 inside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3739 if (white_in_cnt)
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 end_xpos = add_margin_runes (dl, idb, dl->bounds.right_white,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3742 white_in_cnt, GL_WHITESPACE, RIGHT_GLYPHS,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3743 window);
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3746 end_xpos = dl->bounds.right_white;
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 /* Make sure that the area between the end of the whitespace glyphs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3749 and the inside margin glyphs is cleared. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3750 if (in_in_cnt && (in_in_start - end_xpos))
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 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
3753 RIGHT_GLYPHS);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3756 /* Next add the inside margin glyphs which are actually in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3757 inside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3758 if (in_in_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3759 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3760 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
3761 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3762 }
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 /* 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
3765 of the inside margin area gets cleared. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3766 if (idb && (dl->bounds.right_in - end_xpos))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3767 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3768 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
3769 RIGHT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3770 }
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 /* Next add any whitespace glyphs in the outside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3773 if (white_out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3774 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3775 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
3776 GL_WHITESPACE, RIGHT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3777 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3778 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3779 end_xpos = dl->bounds.right_in;
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 /* Next add any inside margin glyphs in the outside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3782 if (in_out_cnt)
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 end_xpos = add_margin_runes (dl, odb, end_xpos, in_out_cnt,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3785 GL_INSIDE_MARGIN, RIGHT_GLYPHS, window);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3788 /* There may be space between any whitespace or inside margin glyphs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3789 in the outside margin and the actual outside margin glyphs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3790 if (odb && (out_start - end_xpos))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3791 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3792 add_margin_blank (dl, odb, w, end_xpos, out_start - end_xpos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3793 RIGHT_GLYPHS);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3794 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3795
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3796 /* Finally, add the outside margin glyphs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3797 if (out_cnt)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3798 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3799 add_margin_runes (dl, odb, out_start, out_cnt, GL_OUTSIDE_MARGIN,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3800 RIGHT_GLYPHS, window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3801 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3802 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3803
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3804
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3805 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3806 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3807 /* modeline routines */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3808 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3809 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3810
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3811 /* 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
3812 void
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3813 generate_formatted_string_db (Lisp_Object format_str, Lisp_Object result_str,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3814 struct window *w, struct display_line *dl,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3815 struct display_block *db, face_index findex,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3816 int min_pixpos, int max_pixpos, int type)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3817 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3818 struct frame *f = XFRAME (w->frame);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3819 struct device *d = XDEVICE (f->device);
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 pos_data data;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3822 int c_pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3823 Charcount offset = 0;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3824
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3825 xzero (data);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3826 data.d = d;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3827 data.db = db;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3828 data.dl = dl;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3829 data.findex = findex;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3830 data.pixpos = min_pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3831 data.max_pixpos = max_pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3832 data.cursor_type = NO_CURSOR;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3833 data.last_charset = Qunbound;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3834 data.last_findex = DEFAULT_INDEX;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3835 data.result_str = result_str;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3836 data.is_modeline = 1;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3837 data.string = Qnil;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3838 data.window = wrap_window (w);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3839
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3840 Dynarr_reset (formatted_string_extent_dynarr);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3841 Dynarr_reset (formatted_string_extent_start_dynarr);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3842 Dynarr_reset (formatted_string_extent_end_dynarr);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3843
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3844 /* 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
3845 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
3846 horizontal scrolling amount */
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3847 if (! NILP (result_str))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3848 offset = w->modeline_hscroll;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3849 generate_fstring_runes (w, &data, 0, 0, -1, format_str, 0,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3850 max_pixpos - min_pixpos, findex, type, &offset,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3851 Qnil);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3852
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3853 if (Dynarr_length (db->runes))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3854 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3855 struct rune *rb =
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3856 Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3857 c_pixpos = rb->xpos + rb->width;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3858 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3859 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3860 c_pixpos = min_pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3861
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3862 /* 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
3863 to make up the difference. This usually only occurs if the
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3864 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
3865 font of a different size from the default face font. */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3866
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3867 if (c_pixpos < max_pixpos)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3868 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3869 data.pixpos = c_pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3870 data.blank_width = max_pixpos - data.pixpos;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3871
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3872 add_blank_rune (&data, NULL, 0);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3873 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3874
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3875 /* Now create the result string and frob the extents into it. */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3876 if (!NILP (result_str))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3877 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3878 int elt;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3879 Bytecount len;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
3880 Ibyte *strdata;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3881 struct buffer *buf = XBUFFER (WINDOW_BUFFER (w));
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3882
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3883 in_modeline_generation = 1;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3884
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
3885 sledgehammer_check_ascii_begin (result_str);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3886 detach_all_extents (result_str);
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3887 resize_string (result_str, -1,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3888 data.bytepos - XSTRING_LENGTH (result_str));
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3889
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3890 strdata = XSTRING_DATA (result_str);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3891
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3892 for (elt = 0, len = 0; elt < Dynarr_length (db->runes); elt++)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3893 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3894 if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3895 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
3896 len += (set_itext_ichar
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3897 (strdata + len, Dynarr_atp (db->runes,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3898 elt)->object.chr.ch));
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3899 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3900 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3901
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
3902 init_string_ascii_begin (result_str);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
3903 bump_string_modiff (result_str);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
3904 sledgehammer_check_ascii_begin (result_str);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
3905
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3906 for (elt = 0; elt < Dynarr_length (formatted_string_extent_dynarr);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3907 elt++)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3908 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3909 Lisp_Object extent = Qnil;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3910 Lisp_Object child;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3911
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
3912 extent = wrap_extent (Dynarr_at (formatted_string_extent_dynarr, elt));
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3913 child = Fgethash (extent, buf->modeline_extent_table, Qnil);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3914 if (NILP (child))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3915 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3916 child = Fmake_extent (Qnil, Qnil, result_str);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3917 Fputhash (extent, child, buf->modeline_extent_table);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3918 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3919 Fset_extent_parent (child, extent);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3920 set_extent_endpoints
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3921 (XEXTENT (child),
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3922 Dynarr_at (formatted_string_extent_start_dynarr, elt),
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3923 Dynarr_at (formatted_string_extent_end_dynarr, elt),
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3924 result_str);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3925 }
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3926
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
3927 in_modeline_generation = 0;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3928 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3929 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
3930
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3931 /* Ensure that the given display line DL accurately represents the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3932 modeline for the given window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3933 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3934 generate_modeline (struct window *w, struct display_line *dl, int type)
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 buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3937 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3938 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3939
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3940 /* Unlike display line and rune pointers, this one can't change underneath
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3941 our feet. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3942 struct display_block *db = get_display_block_from_line (dl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3943 int max_pixpos, min_pixpos, ypos_adj;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3944 Lisp_Object font_inst;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3945
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3946 /* This will actually determine incorrect inside boundaries for the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3947 modeline since it ignores the margins. However being aware of this fact
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3948 we never use those values anywhere so it doesn't matter. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3949 dl->bounds = calculate_display_line_boundaries (w, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3950
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3951 /* We are generating a modeline. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3952 dl->modeline = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3953 dl->cursor_elt = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3954
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3955 /* Reset the runes on the modeline. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3956 Dynarr_reset (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3957
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3958 if (!WINDOW_HAS_MODELINE_P (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3959 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3960 struct rune rb;
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 /* If there is a horizontal scrollbar, don't add anything. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3963 if (window_scrollbar_height (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3964 return;
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 dl->ascent = DEVMETH (d, divider_height, ());
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3967 dl->descent = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3968 /* The modeline is at the bottom of the gutters. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3969 dl->ypos = WINDOW_BOTTOM (w);
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 rb.findex = MODELINE_INDEX;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3972 rb.xpos = dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3973 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
3974 rb.charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3975 rb.endpos = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3976 rb.type = RUNE_HLINE;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3977 rb.object.hline.thickness = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3978 rb.object.hline.yoffset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3979 rb.cursor_type = NO_CURSOR;
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)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3982 && FRAME_WIN_P (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3983 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3984 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3985
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3986 dl->ypos -= shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3987 rb.xpos += shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3988 rb.width -= 2 * shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3989 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3990
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3991 Dynarr_add (db->runes, rb);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3992 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3993 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3994
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3995 /* !!#### not right; needs to compute the max height of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3996 all the charsets */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3997 font_inst = WINDOW_FACE_CACHEL_FONT (w, MODELINE_INDEX, Vcharset_ascii);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3998
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3999 dl->ascent = XFONT_INSTANCE (font_inst)->ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4000 dl->descent = XFONT_INSTANCE (font_inst)->descent;
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 min_pixpos = dl->bounds.left_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4003 max_pixpos = dl->bounds.right_out;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4004
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4005 if (!EQ (Qzero, w->modeline_shadow_thickness) && FRAME_WIN_P (f))
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 int shadow_thickness = MODELINE_SHADOW_THICKNESS (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4008
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4009 ypos_adj = shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4010 min_pixpos += shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4011 max_pixpos -= shadow_thickness;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4012 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4013 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4014 ypos_adj = 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 generate_formatted_string_db (b->modeline_format,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4017 b->generated_modeline_string, w, dl, db,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4018 MODELINE_INDEX, min_pixpos, max_pixpos, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4019
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4020 /* 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
4021 set this until we've generated the modeline in order to account
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4022 for any embedded faces. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4023 dl->ypos = WINDOW_BOTTOM (w) - dl->descent - ypos_adj;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4024 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4025
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4026 static Charcount
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4027 add_string_to_fstring_db_runes (pos_data *data, const Ibyte *str,
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4028 Charcount pos, Charcount min_pos,
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4029 Charcount max_pos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4030 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4031 /* This function has been Mule-ized. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4032 Charcount end;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4033 const Ibyte *cur_pos = str;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4034 struct display_block *db = data->db;
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 data->blank_width = space_width (XWINDOW (data->window));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4037 while (Dynarr_length (db->runes) < pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4038 add_blank_rune (data, NULL, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4039
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4040 end = (Dynarr_length (db->runes) +
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4041 bytecount_to_charcount (str, strlen ((const char *) str)));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4042 if (max_pos != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4043 end = min (max_pos, end);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4044
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4045 while (pos < end && *cur_pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4046 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4047 const Ibyte *old_cur_pos = cur_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4048 int succeeded;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4049
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4050 data->ch = itext_ichar (cur_pos);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4051 succeeded = (add_ichar_rune (data) != ADD_FAILED);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4052 INC_IBYTEPTR (cur_pos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4053 if (succeeded)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4054 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4055 pos++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4056 data->modeline_charpos++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4057 data->bytepos += cur_pos - old_cur_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4058 }
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4061 while (Dynarr_length (db->runes) < min_pos &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4062 (data->pixpos + data->blank_width <= data->max_pixpos))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4063 add_blank_rune (data, NULL, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4064
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4065 return Dynarr_length (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4066 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4067
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4068 /* #### Urk! Should also handle begin-glyphs and end-glyphs in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4069 modeline extents. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4070 static Charcount
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4071 add_glyph_to_fstring_db_runes (pos_data *data, Lisp_Object glyph,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4072 Charcount pos, Charcount min_pos,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4073 Charcount max_pos, Lisp_Object extent)
428
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 /* This function has been Mule-ized. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4076 Charcount end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4077 struct display_block *db = data->db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4078 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4079
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4080 data->blank_width = space_width (XWINDOW (data->window));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4081 while (Dynarr_length (db->runes) < pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4082 add_blank_rune (data, NULL, 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 end = Dynarr_length (db->runes) + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4085 if (max_pos != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4086 end = min (max_pos, end);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4087
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4088 gb.glyph = glyph;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4089 gb.extent = extent;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4090 add_glyph_rune (data, &gb, BEGIN_GLYPHS, 0, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4091 pos++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4092
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4093 while (Dynarr_length (db->runes) < pos &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4094 (data->pixpos + data->blank_width <= data->max_pixpos))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4095 add_blank_rune (data, NULL, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4096
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4097 return Dynarr_length (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4098 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4099
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4100 /* 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
4101 true of max_pixsize. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4102 #define SET_CURRENT_MODE_CHARS_PIXSIZE \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4103 if (Dynarr_length (data->db->runes)) \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4104 cur_pixsize = data->pixpos - Dynarr_atp (data->db->runes, 0)->xpos; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4105 else \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4106 cur_pixsize = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4107
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4108 /* Note that this function does "positions" in terms of characters and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4109 not in terms of columns. This is necessary to make the formatting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4110 work correctly when proportional width fonts are used in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4111 modeline. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4112 static Charcount
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4113 generate_fstring_runes (struct window *w, pos_data *data, Charcount pos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4114 Charcount min_pos, Charcount max_pos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4115 Lisp_Object elt, int depth, int max_pixsize,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4116 face_index findex, int type, Charcount *offset,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4117 Lisp_Object cur_ext)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4118 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4119 /* This function has been Mule-ized. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4120 /* #### The other losing things in this function are:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4121
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4122 -- C zero-terminated-string lossage.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4123 -- Non-printable characters should be converted into something
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4124 appropriate (e.g. ^F) instead of blindly being printed anyway.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4125 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4126
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4127 tail_recurse:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4128 if (depth > 10)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4129 goto invalid;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4130
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4131 depth++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4132
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4133 if (STRINGP (elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4134 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4135 /* A string. Add to the display line and check for %-constructs
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4136 within it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4137
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4138 Ibyte *this = XSTRING_DATA (elt);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4139
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4140 while ((pos < max_pos || max_pos == -1) && *this)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4141 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4142 Ibyte *last = this;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4143
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4144 while (*this && *this != '%')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4145 this++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4146
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4147 if (this != last)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4148 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4149 /* No %-construct */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4150 Charcount size =
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4151 bytecount_to_charcount (last, this - last);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4152
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4153 if (size <= *offset)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4154 *offset -= size;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4155 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4156 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4157 Charcount tmp_max = (max_pos == -1 ? pos + size - *offset :
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4158 min (pos + size - *offset, max_pos));
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4159 const Ibyte *tmp_last = itext_n_addr (last, *offset);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4160
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4161 pos = add_string_to_fstring_db_runes (data, tmp_last,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4162 pos, pos, tmp_max);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4163 *offset = 0;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4164 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4165 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4166 else /* *this == '%' */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4167 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4168 Charcount spec_width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4169
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4170 this++; /* skip over '%' */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4171
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4172 /* We can't allow -ve args due to the "%-" construct.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4173 * Argument specifies minwidth but not maxwidth
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4174 * (maxwidth can be specified by
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4175 * (<negative-number> . <stuff>) modeline elements)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4176 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4177 while (isdigit (*this))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4178 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4179 spec_width = spec_width * 10 + (*this - '0');
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4180 this++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4181 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4182 spec_width += pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4183
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4184 if (*this == 'M')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4185 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4186 pos = generate_fstring_runes (w, data, pos, spec_width,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4187 max_pos, Vglobal_mode_string,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4188 depth, max_pixsize, findex,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4189 type, offset, cur_ext);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4190 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4191 else if (*this == '-')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4192 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4193 Charcount num_to_add;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4194
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4195 if (max_pixsize < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4196 num_to_add = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4197 else if (max_pos != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4198 num_to_add = max_pos - pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4199 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4200 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4201 int cur_pixsize;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4202 int dash_pixsize;
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4203 Ibyte ch = '-';
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4204 SET_CURRENT_MODE_CHARS_PIXSIZE;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4205
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4206 dash_pixsize =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4207 redisplay_text_width_string (w, findex, &ch, Qnil, 0,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4208 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4209
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4210 num_to_add = (max_pixsize - cur_pixsize) / dash_pixsize;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4211 num_to_add++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4212 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4213
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4214 while (num_to_add--)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4215 pos = add_string_to_fstring_db_runes
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4216 (data, (const Ibyte *) "-", pos, pos, max_pos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4217 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4218 else if (*this != 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4219 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4220 Ichar ch = itext_ichar (this);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4221 Ibyte *str;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4222 Charcount size;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4223
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4224 decode_mode_spec (w, ch, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4225
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4226 str = Dynarr_atp (mode_spec_ibyte_string, 0);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4227 size = bytecount_to_charcount
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4228 /* 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
4229 (str, Dynarr_length (mode_spec_ibyte_string)) - 1;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4230
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4231 if (size <= *offset)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4232 *offset -= size;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4233 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4234 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4235 const Ibyte *tmp_str = itext_n_addr (str, *offset);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4236
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
4237 /* #### 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
4238 computed and used here as in the plain string case
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4239 above. -- dv */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4240 pos = add_string_to_fstring_db_runes (data, tmp_str,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4241 pos, pos,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4242 max_pos);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4243 *offset = 0;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4244 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4245 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4246
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4247 /* NOT this++. There could be any sort of character at
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4248 the current position. */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4249 INC_IBYTEPTR (this);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4250 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4251
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4252 if (max_pixsize > 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4253 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4254 int cur_pixsize;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4255 SET_CURRENT_MODE_CHARS_PIXSIZE;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4256
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4257 if (cur_pixsize >= max_pixsize)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4258 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4259 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4260 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4261 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4262 else if (SYMBOLP (elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4263 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4264 /* A symbol: process the value of the symbol recursively
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4265 as if it appeared here directly. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4266 Lisp_Object tem = symbol_value_in_buffer (elt, w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4267
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4268 if (!UNBOUNDP (tem))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4269 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4270 /* If value is a string, output that string literally:
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4271 don't check for % within it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4272 if (STRINGP (tem))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4273 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4274 Ibyte *str = XSTRING_DATA (tem);
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4275 Charcount size = string_char_length (tem);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4276
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4277 if (size <= *offset)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4278 *offset -= size;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4279 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4280 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4281 const Ibyte *tmp_str = itext_n_addr (str, *offset);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4282
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
4283 /* #### 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
4284 computed and used here as in the plain string case
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4285 above. -- dv */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4286 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4287 min_pos, max_pos);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4288 *offset = 0;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4289 }
428
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 /* Give up right away for nil or t. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4292 else if (!EQ (tem, elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4293 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4294 elt = tem;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4295 goto tail_recurse;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4296 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4297 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4298 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4299 else if (GENERIC_SPECIFIERP (elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4300 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4301 Lisp_Object window, tem;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
4302 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4303 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
4304 ERROR_ME_DEBUG_WARN, 0, Qzero);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4305 if (!UNBOUNDP (tem))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4306 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4307 elt = tem;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4308 goto tail_recurse;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4309 }
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 else if (CONSP (elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4312 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4313 /* A cons cell: four distinct cases.
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4314 * - 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
4315 * and effectively concatenate them.
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4316 * - If first element is a negative number, truncate displaying cdr to
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4317 * at most that many characters. If positive, pad (with spaces)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4318 * to at least that many characters.
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4319 * - 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
4320 * 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
4321 * 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
4322 * - 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
4323 * 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
4324 * the modeline's window is non-nil or nil.
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4325 * - If first element is an extent, process the cdr recursively
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4326 * and handle the extent's face.
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4327 */
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4328
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4329 Lisp_Object car, tem;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4330
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4331 car = XCAR (elt);
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4332 if (SYMBOLP (car) || BOOLEAN_SPECIFIERP (car))
438
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 (!CONSP (elt))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4336 goto invalid;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4337
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4338 if (SYMBOLP (car))
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4339 tem = symbol_value_in_buffer (car, w->buffer);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4340 else
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4341 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
4342 ERROR_ME_DEBUG_WARN, 0, Qzero);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4343 /* 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
4344 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
4345 if (!UNBOUNDP (tem) && !NILP (tem))
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4346 {
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4347 elt = XCAR (elt);
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4348 goto tail_recurse;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4349 }
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
4350 /* 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
4351 * Get the cddr of the original list
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4352 * and if possible find the caddr and use that.
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4353 */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4354 elt = XCDR (elt);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4355 if (NILP (elt))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4356 ;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4357 else if (!CONSP (elt))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4358 goto invalid;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4359 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4360 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4361 elt = XCAR (elt);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4362 goto tail_recurse;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4363 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4364 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4365 else if (INTP (car))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4366 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4367 Charcount lim = XINT (car);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4368
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4369 elt = XCDR (elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4370
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4371 if (lim < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4372 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4373 /* Negative int means reduce maximum width.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4374 * DO NOT change MIN_PIXPOS here!
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4375 * (20 -10 . foo) should truncate foo to 10 col
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4376 * and then pad to 20.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4377 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4378 if (max_pos == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4379 max_pos = pos - lim;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4380 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4381 max_pos = min (max_pos, pos - lim);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4382 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4383 else if (lim > 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4384 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4385 /* Padding specified. Don't let it be more than
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4386 * current maximum.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4387 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4388 lim += pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4389 if (max_pos != -1 && lim > max_pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4390 lim = max_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4391 /* If that's more padding than already wanted, queue it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4392 * But don't reduce padding already specified even if
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4393 * that is beyond the current truncation point.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4394 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4395 if (lim > min_pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4396 min_pos = lim;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4397 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4398 goto tail_recurse;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4399 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4400 else if (STRINGP (car) || CONSP (car))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4401 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4402 int limit = 50;
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4403
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4404 /* LIMIT is to protect against circular lists. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4405 while (CONSP (elt) && --limit > 0
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4406 && (pos < max_pos || max_pos == -1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4407 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4408 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4409 XCAR (elt), depth, max_pixsize,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4410 findex, type, offset, cur_ext);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4411 elt = XCDR (elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4412 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4413 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4414 else if (EXTENTP (car))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4415 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4416 struct extent *ext = XEXTENT (car);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4417
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4418 if (EXTENT_LIVE_P (ext))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4419 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4420 face_index old_findex = data->findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4421 Lisp_Object face;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4422 Lisp_Object font_inst;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4423 face_index new_findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4424 Bytecount start = data->bytepos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4425
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4426 face = extent_face (ext);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4427 if (FACEP (face))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4428 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4429 /* #### needs to merge faces, sigh */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4430 /* #### needs to handle list of faces */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4431 new_findex = get_builtin_face_cache_index (w, face);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4432 /* !!#### not right; needs to compute the max height of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4433 all the charsets */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4434 font_inst = WINDOW_FACE_CACHEL_FONT (w, new_findex,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4435 Vcharset_ascii);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4436
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4437 data->dl->ascent = max (data->dl->ascent,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4438 XFONT_INSTANCE (font_inst)->ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4439 data->dl->descent = max (data->dl->descent,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4440 XFONT_INSTANCE (font_inst)->
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4441 descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4442 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4443 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4444 new_findex = old_findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4445
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4446 data->findex = new_findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4447 pos = generate_fstring_runes (w, data, pos, pos, max_pos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4448 XCDR (elt), depth - 1,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4449 max_pixsize, new_findex, type,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4450 offset, car);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4451 data->findex = old_findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4452 Dynarr_add (formatted_string_extent_dynarr, ext);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4453 Dynarr_add (formatted_string_extent_start_dynarr, start);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4454 Dynarr_add (formatted_string_extent_end_dynarr, data->bytepos);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4455 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4456 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4457 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4458 else if (GLYPHP (elt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4459 {
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4460 /* Glyphs are considered as one character with respect to the modeline
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4461 horizontal scrolling facility. -- dv */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4462 if (*offset > 0)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4463 *offset -= 1;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4464 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4465 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
4466 cur_ext);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4467 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4468 else
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 invalid:
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4471 {
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4472 char *str = GETTEXT ("*invalid*");
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4473 Charcount size = (Charcount) strlen (str); /* is this ok ?? -- dv */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4474
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4475 if (size <= *offset)
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4476 *offset -= size;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4477 else
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4478 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4479 const Ibyte *tmp_str =
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4480 itext_n_addr ((const Ibyte *) str, *offset);
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4481
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
4482 /* #### 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
4483 used here as in the plain string case above. -- dv */
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4484 pos = add_string_to_fstring_db_runes (data, tmp_str, pos,
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4485 min_pos, max_pos);
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4486 *offset = 0;
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4487 }
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4488 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4489 }
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 if (min_pos > pos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4492 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4493 add_string_to_fstring_db_runes (data, (const Ibyte *) "", pos,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
4494 min_pos, -1);
428
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4497 return pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4498 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4499
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4500 /* Update just the modeline. Assumes the desired display structs. If
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4501 they do not have a modeline block, it does nothing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4502 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4503 regenerate_modeline (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4504 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4505 display_line_dynarr *dla = window_display_lines (w, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4506
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4507 if (!Dynarr_length (dla) || !Dynarr_atp (dla, 0)->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4508 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4509 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4510 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4511 generate_modeline (w, Dynarr_atp (dla, 0), DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4512 redisplay_update_line (w, 0, 0, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4513 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4514 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4515
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4516 /* Make sure that modeline display line is present in the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4517 display structs if the window has a modeline and update that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4518 line. Returns true if a modeline was needed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4519 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4520 ensure_modeline_generated (struct window *w, int type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4521 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4522 int need_modeline;
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 /* minibuffer windows don't have modelines */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4525 if (MINI_WINDOW_P (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4526 need_modeline = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4527 /* windows which haven't had it turned off do */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4528 else if (WINDOW_HAS_MODELINE_P (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4529 need_modeline = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4530 /* 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
4531 a horizontal scrollbar */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4532 else if (window_scrollbar_height (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4533 need_modeline = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4534 /* and in this case there is none */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4535 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4536 need_modeline = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4537
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4538 if (need_modeline)
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 display_line_dynarr *dla;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4541
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4542 dla = window_display_lines (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4543
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4544 /* We don't care if there is a display line which is not
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4545 currently a modeline because it is definitely going to become
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4546 one if we have gotten to this point. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4547 if (Dynarr_length (dla) == 0)
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 if (Dynarr_largest (dla) > 0)
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
4550 Dynarr_increment (dla);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4551 else
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 struct display_line modeline;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4554 xzero (modeline);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4555 Dynarr_add (dla, modeline);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4556 }
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4559 /* If we're adding a new place marker go ahead and generate the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4560 modeline so that it is available for use by
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4561 window_modeline_height. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4562 generate_modeline (w, Dynarr_atp (dla, 0), type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4563 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4564
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4565 return need_modeline;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4566 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4567
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4568 /* #### Kludge or not a kludge. I tend towards the former. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4569 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4570 real_current_modeline_height (struct window *w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4571 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4572 Fset_marker (w->start[CMOTION_DISP], w->start[CURRENT_DISP], w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4573 Fset_marker (w->pointm[CMOTION_DISP], w->pointm[CURRENT_DISP], w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4574
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4575 if (ensure_modeline_generated (w, CMOTION_DISP))
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 display_line_dynarr *dla = window_display_lines (w, CMOTION_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4578
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4579 if (Dynarr_length (dla))
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 if (Dynarr_atp (dla, 0)->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4582 return (Dynarr_atp (dla, 0)->ascent +
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4583 Dynarr_atp (dla, 0)->descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4584 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4585 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4586 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4587 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4588
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4589
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4590 /***************************************************************************/
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4591 /* */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4592 /* displayable string routines */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4593 /* */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4594 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4595
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4596 /* 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
4597 display line DL accurately represents the text on a line starting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4598 at the given position.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4599
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4600 Yes, this is duplicating the code of create_text_block, but it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4601 looked just too hard to change create_text_block to handle strings
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4602 *and* buffers. We already make a distinction between the two
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4603 elsewhere in the code so I think unifying them would require a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4604 complete MULE rewrite. Besides, the other distinction is that these
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4605 functions cover text that the user *cannot edit* so we can remove
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4606 everything to do with cursors, minibuffers etc. Eventually the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4607 modeline routines should be modified to use this code as it copes
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4608 with many more types of display situation. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4609
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
4610 static Charbpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4611 create_string_text_block (struct window *w, Lisp_Object disp_string,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4612 struct display_line *dl,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4613 Charcount start_pos,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4614 prop_block_dynarr **prop,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4615 face_index default_face)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4616 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4617 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4618 /* 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
4619 because you might well want to make use of it (selective display
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4620 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
4621 seems to be possible for buffer to be nil sometimes so protect
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4622 against this case. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4623 struct buffer *b = BUFFERP (w->buffer) ? XBUFFER (w->buffer) : 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4624 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4625
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4626 /* we're working with these a lot so precalculate them */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4627 Bytecount slen = XSTRING_LENGTH (disp_string);
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4628 Bytecount byte_string_zv = slen;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4629 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
4630
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4631 pos_data data;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4632
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4633 int truncate_win = b ? window_truncation_on (w) : 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4634
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4635 /* 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
4636 FSF thing and invisible extents are the way to go here.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4637 Implementing it also relies on a number of buffer-specific
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4638 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
4639 here. */
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 /* The variable ctl-arrow allows the user to specify what characters
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4642 can actually be displayed and which octal should be used for.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4643 #### This variable should probably have some rethought done to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4644 it.
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 #### It would also be really nice if you could specify that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4647 the characters come out in hex instead of in octal. Mule
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4648 does that by adding a ctl-hexa variable similar to ctl-arrow,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4649 but that's bogus -- we need a more general solution. I
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4650 think you need to extend the concept of display tables
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4651 into a more general conversion mechanism. Ideally you
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4652 could specify a Lisp function that converts characters,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4653 but this violates the Second Golden Rule and besides would
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4654 make things way way way way slow.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4655
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4656 So instead, we extend the display-table concept, which was
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4657 historically limited to 256-byte vectors, to one of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4658 following:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4659
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4660 a) A 256-entry vector, for backward compatibility;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4661 b) char-table, mapping characters to values;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4662 c) range-table, mapping ranges of characters to values;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4663 d) a list of the above.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4664
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4665 The (d) option allows you to specify multiple display tables
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4666 instead of just one. Each display table can specify conversions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4667 for some characters and leave others unchanged. The way the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4668 character gets displayed is determined by the first display table
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4669 with a binding for that character. This way, you could call a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4670 function `enable-hex-display' that adds a hex display-table to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4671 the list of display tables for the current buffer.
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 #### ...not yet implemented... Also, we extend the concept of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4674 "mapping" to include a printf-like spec. Thus you can make all
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4675 extended characters show up as hex with a display table like
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4676 this:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4677
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4678 #s(range-table data ((256 524288) (format "%x")))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4679
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4680 Since more than one display table is possible, you have
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4681 great flexibility in mapping ranges of characters. */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4682 Ichar printable_min = b ? (CHAR_OR_CHAR_INTP (b->ctl_arrow)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4683 ? XCHAR_OR_CHAR_INT (b->ctl_arrow)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4684 : ((EQ (b->ctl_arrow, Qt) || EQ (b->ctl_arrow, Qnil))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4685 ? 255 : 160)) : 255;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4686
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4687 Lisp_Object face_dt, window_dt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4688
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4689 /* The text display block for this display line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4690 struct display_block *db = get_display_block_from_line (dl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4691
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4692 /* 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
4693 data to be updated. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4694 int initial = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4695
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4696 /* Apparently the new extent_fragment_update returns an end position
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4697 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
4698 displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4699 int no_more_frags = 0;
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 dl->used_prop_data = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4702 dl->num_chars = 0;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
4703 dl->line_continuation = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4704
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4705 /* set up faces to use for clearing areas, used by
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4706 output_display_line */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4707 dl->default_findex = default_face;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4708 if (default_face)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4709 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4710 dl->left_margin_findex = default_face;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4711 dl->right_margin_findex = default_face;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4712 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4713 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4714 {
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
4715 dl->left_margin_findex =
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4716 get_builtin_face_cache_index (w, Vleft_margin_face);
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
4717 dl->right_margin_findex =
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4718 get_builtin_face_cache_index (w, Vright_margin_face);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4719 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4720
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4721 xzero (data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4722 data.ef = extent_fragment_new (disp_string, f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4723
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4724 /* 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
4725 them to this structure for ease of passing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4726 data.d = d;
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
4727 data.window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4728 data.db = db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4729 data.dl = dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4730
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4731 data.byte_charpos = byte_start_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4732 data.pixpos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4733 data.last_charset = Qunbound;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4734 data.last_findex = default_face;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4735 data.result_str = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4736 data.string = disp_string;
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 /* Set the right boundary adjusting it to take into account any end
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4739 glyph. Save the width of the end glyph for later use. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4740 data.max_pixpos = dl->bounds.right_in;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4741 data.max_pixpos -= data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4742
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4743 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4744 data.cursor_x = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4745
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4746 data.start_col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4747 /* 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
4748 the window
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4749 data.start_col = w->hscroll;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4750 data.byte_start_col_enabled = (w->hscroll ? byte_start_pos : 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4751 */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4752 data.byte_start_col_enabled = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4753 data.hscroll_glyph_width_adjust = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4754
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4755 /* We regenerate the line from the very beginning. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4756 Dynarr_reset (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4757
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4758 /* 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
4759 starting position is already equal to the maximum we can't add
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4760 anything else, right? Wrong. We might still have a newline to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4761 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
4762 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
4763 glyph. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4764
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4765 /* #### Chuck -- I think this condition should be while (1).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4766 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
4767 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
4768 end-glyph and text might not be displayed. while (1) ensures
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4769 that the loop terminates only when either (a) there is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4770 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
4771
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4772 #### Also I think you need to ensure that the operation
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4773 "add begin glyphs; add end glyphs; add text" is atomic and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4774 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
4775 of the line during that operation, then you keep accumulating
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4776 propagation data until you're done. Otherwise, if the (e.g.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4777 there's a begin glyph at a particular position and attempting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4778 to display that glyph results in window-end being hit and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4779 propagation data being generated, then the character at that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4780 position won't be displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4781
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4782 #### See also the comment after the end of this loop, below.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4783 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4784 while (data.pixpos <= data.max_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4785 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4786 /* #### This check probably should not be necessary. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4787 if (data.byte_charpos > byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4788 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4789 /* #### urk! More of this lossage! */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4790 data.byte_charpos--;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4791 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4792 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4793
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4794 /* Check for face changes. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4795 if (initial || (!no_more_frags && data.byte_charpos == data.ef->end))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4796 {
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4797 Lisp_Object last_glyph = Qnil;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4798 /* Deal with clipped glyphs that we have already displayed. */
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4799 if (*prop && Dynarr_atp (*prop, 0)->type == PROP_GLYPH)
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4800 {
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4801 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
4802 Dynarr_free (*prop);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4803 *prop = 0;
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4804 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4805 /* Now compute the face and begin/end-glyph information. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4806 data.findex =
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
4807 /* Remember that the extent-fragment routines deal in
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4808 Bytexpos's. */
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4809 extent_fragment_update (w, data.ef, data.byte_charpos, last_glyph);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4810 /* This is somewhat cheesy but the alternative is to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4811 propagate default_face into extent_fragment_update. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4812 if (data.findex == DEFAULT_INDEX)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4813 data.findex = default_face;
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 get_display_tables (w, data.findex, &face_dt, &window_dt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4816
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4817 if (data.byte_charpos == data.ef->end)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4818 no_more_frags = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4819 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4820 initial = 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 /* Determine what is next to be displayed. We first handle any
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
4823 glyphs returned by glyphs_at_charbpos. If there are no glyphs to
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4824 display then we determine what to do based on the character at the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4825 current buffer position. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4826
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4827 /* If the current position is covered by an invisible extent, do
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4828 nothing (except maybe add some ellipses).
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 #### The behavior of begin and end-glyphs at the edge of an
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4831 invisible extent should be investigated further. This is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4832 fairly low priority though. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4833 if (data.ef->invisible)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4834 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4835 /* #### Chuck, perhaps you could look at this code? I don't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4836 really know what I'm doing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4837 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4838 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4839 Dynarr_free (*prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4840 *prop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4841 }
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 /* The extent fragment code only sets this when we should
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4844 really display the ellipses. It makes sure the ellipses
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4845 don't get displayed more than once in a row. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4846 if (data.ef->invisible_ellipses)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4847 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4848 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4849
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4850 data.ef->invisible_ellipses_already_displayed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4851 data.ef->invisible_ellipses = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4852 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4853 gb.glyph = Vinvisible_text_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4854 *prop = add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4855 GLYPH_CACHEL (w, INVIS_GLYPH_INDEX));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4856 /* Perhaps they shouldn't propagate if the very next thing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4857 is to display a newline (for compatibility with
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4858 selective-display-ellipses)? Maybe that's too
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4859 abstruse. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4860 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4861 goto done;
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
638
373ced43e288 [xemacs-hg @ 2001-07-26 21:10:44 by adrian]
adrian
parents: 617
diff changeset
4864 /* #### What if we're dealing with a display table? */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4865 if (data.start_col)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4866 data.start_col--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4867
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4868 if (data.byte_charpos == byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4869 goto done;
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 is propagation data, then it represents the current
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4875 buffer position being displayed. Add them and advance the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4876 position counter. This might also add the minibuffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4877 prompt. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4878 else if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4879 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4880 dl->used_prop_data = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4881 *prop = add_propagation_runes (prop, &data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4882
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4883 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4884 goto done; /* gee, a really narrow window */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4885 else if (data.byte_charpos == byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4886 goto done;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4887 else if (data.byte_charpos < 0)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4888 /* #### 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
4889 data.byte_charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4890 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4891 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4892 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4893
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4894 /* If there are end glyphs, add them to the line. These are
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4895 the end glyphs for the previous run of text. We add them
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4896 here rather than doing them at the end of handling the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4897 previous run so that glyphs at the beginning and end of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4898 a line are handled correctly. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4899 else if (Dynarr_length (data.ef->end_glyphs) > 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4900 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4901 data.ch = string_ichar (disp_string, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4902 *prop = add_glyph_runes (&data, END_GLYPHS);
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4903
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4904 if (*prop) {
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4905 goto done;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4906 }
428
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4909 /* If there are begin glyphs, add them to the line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4910 else if (Dynarr_length (data.ef->begin_glyphs) > 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4911 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4912 data.ch = string_ichar (disp_string, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4913 *prop = add_glyph_runes (&data, BEGIN_GLYPHS);
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4914
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4915 if (*prop) {
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4916 goto done;
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4917 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4918 }
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 at end-of-buffer, we've already processed begin and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4921 end-glyphs at this point and there's no text to process,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4922 so we're done. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
4923 else if (data.byte_charpos == byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4924 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4925
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4926 else
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 Lisp_Object entry = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4929 /* 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
4930 data.ch = string_ichar (disp_string, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4931 if (!NILP (face_dt) || !NILP (window_dt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4932 entry = display_table_entry (data.ch, face_dt, window_dt);
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 /* If there is a display table entry for it, hand it off to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4935 add_disp_table_entry_runes and let it worry about it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4936 if (!NILP (entry) && !EQ (entry, make_char (data.ch)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4937 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4938 *prop = add_disp_table_entry_runes (&data, entry);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4939
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 /* Check if we have hit a newline character. If so, add a marker
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4945 to the line and end this loop. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4946 else if (data.ch == '\n')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4947 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4948 /* We aren't going to be adding an end glyph so give its
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4949 space back in order to make sure that the cursor can
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4950 fit. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
4951 data.max_pixpos += data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4952 goto done;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4955 /* If the current character is considered to be printable, then
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4956 just add it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4957 else if (data.ch >= printable_min)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4958 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
4959 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4960 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4961 goto done;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4964 /* If the current character is a tab, determine the next tab
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4965 starting position and add a blank rune which extends from the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4966 current pixel position to that starting position. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4967 else if (data.ch == '\t')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4968 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4969 int tab_start_pixpos = data.pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4970 int next_tab_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4971 int char_tab_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4972 int prop_width = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4973
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4974 if (data.start_col > 1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4975 tab_start_pixpos -= (space_width (w) * (data.start_col - 1));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4976
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4977 next_tab_start =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4978 next_tab_position (w, tab_start_pixpos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4979 dl->bounds.left_in +
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4980 data.hscroll_glyph_width_adjust);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4981 if (next_tab_start > data.max_pixpos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4982 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4983 prop_width = next_tab_start - data.max_pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4984 next_tab_start = data.max_pixpos;
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 data.blank_width = next_tab_start - data.pixpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4987 char_tab_width =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4988 (next_tab_start - tab_start_pixpos) / space_width (w);
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 *prop = add_blank_rune (&data, w, char_tab_width);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4991
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4992 /* 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
4993 sizes guaranteed to fit in the available space. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4994 assert (!(*prop));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4995
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4996 if (prop_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4997 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4998 struct prop_block pb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4999 *prop = Dynarr_new (prop_block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5000
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5001 pb.type = PROP_BLANK;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5002 pb.data.p_blank.width = prop_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5003 pb.data.p_blank.findex = data.findex;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5004 Dynarr_add (*prop, pb);
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 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5007 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5008 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5009
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5010 /* If character is a control character, pass it off to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5011 add_control_char_runes.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5012
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5013 The is_*() routines have undefined results on
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5014 arguments outside of the range [-1, 255]. (This
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5015 often bites people who carelessly use `char' instead
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5016 of `unsigned char'.)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5017 */
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
5018 else if (data.ch < 0x100 && iscntrl ((Ibyte) data.ch))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5019 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5020 *prop = add_control_char_runes (&data, b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5021
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5022 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5023 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5024 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5025
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5026 /* If the character is above the ASCII range and we have not
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5027 already handled it, then print it as an octal number. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5028 else if (data.ch >= 0200)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5029 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5030 *prop = add_octal_runes (&data);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5031
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5032 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5033 goto done;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5036 /* Assume the current character is considered to be printable,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5037 then just add it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5038 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5039 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
5040 *prop = add_ichar_rune (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5041 if (*prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5042 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5043 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5044
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5045 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5046 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5047 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5048
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5049 done:
428
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 /* 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
5052 end of the buffer. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5053 if (data.byte_charpos < byte_string_zv)
428
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 /* #### This check is not correct. If the line terminated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5056 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
5057 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
5058 you make the two changes mentioned at the top of this loop,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5059 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
5060 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
5061 check. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5062
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5063 /* The common case is that the line ended because we hit a newline.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5064 In that case, the next character is just the next buffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5065 position. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5066 if (data.ch == '\n')
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 INC_BYTECOUNT (XSTRING_DATA (disp_string), data.byte_charpos);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5071 /* Otherwise we have a buffer line which cannot fit on one display
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5072 line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5073 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5074 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5075 struct glyph_block gb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5076 struct glyph_cachel *cachel;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5077
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5078 /* If the line is to be truncated then we actually have to look
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5079 for the next newline. We also add the end-of-line glyph which
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5080 we know will fit because we adjusted the right border before
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5081 we starting laying out the line. */
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5082 data.max_pixpos += data.end_glyph_width;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5083 data.findex = default_face;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5084 gb.extent = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5085
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5086 if (truncate_win)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5087 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5088 Bytecount byte_pos;
428
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 /* 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
5091 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
5092 data.byte_charpos, 1);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5093
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5094 data.cursor_type = NO_CURSOR;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5095 data.byte_charpos = byte_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5096 gb.glyph = Vtruncation_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5097 cachel = GLYPH_CACHEL (w, TRUN_GLYPH_INDEX);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5098 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5099 else
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 /* The cursor can never be on the continuation glyph. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5102 data.cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5103
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5104 /* 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
5105
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5106 dl->line_continuation = 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5107 gb.glyph = Vcontinuation_glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5108 cachel = GLYPH_CACHEL (w, CONT_GLYPH_INDEX);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5109 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5110
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5111 if (data.end_glyph_width)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5112 add_glyph_rune (&data, &gb, BEGIN_GLYPHS, 0, cachel);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5113
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5114 if (truncate_win && data.byte_charpos == byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5115 {
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
5116 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
5117 byte_string_zv);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
5118 DEC_IBYTEPTR (endb);
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
5119 if (itext_ichar (endb) != '\n')
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5120 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5121 /* #### Damn this losing shit. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5122 data.byte_charpos++;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5123 }
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5126 }
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5127 else if (data.byte_charpos == byte_string_zv)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5128 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5129 /* create_text_block () adds a bogus \n marker here which screws
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5130 up subwindow display. Since we never have a cursor in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5131 gutter we can safely ignore it. */
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 left 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 = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5136
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5137 /* Whitespace past a newline is considered right whitespace. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5138 while (elt < Dynarr_length (db->runes))
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 == ' ')
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5143 || rb->type == RUNE_BLANK)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5144 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5145 dl->bounds.left_white += rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5146 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5147 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5148 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5149 elt = Dynarr_length (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5150 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5151 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5152
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5153 /* Calculate right whitespace boundary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5154 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5155 int elt = Dynarr_length (db->runes) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5156 int done = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5157
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5158 while (!done && elt >= 0)
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 struct rune *rb = Dynarr_atp (db->runes, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5161
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5162 if (!(rb->type == RUNE_CHAR && rb->object.chr.ch < 0x100
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5163 && isspace (rb->object.chr.ch))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5164 && !rb->type == RUNE_BLANK)
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 dl->bounds.right_white = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5167 done = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5168 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5169
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5170 elt--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5171
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5174 /* The line is blank so everything is considered to be right
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5175 whitespace. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5176 if (!done)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5177 dl->bounds.right_white = dl->bounds.left_in;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5180 /* Set the display blocks bounds. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5181 db->start_pos = dl->bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5182 if (Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5183 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5184 struct rune *rb = Dynarr_atp (db->runes, Dynarr_length (db->runes) - 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5185
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5186 db->end_pos = rb->xpos + rb->width;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5189 db->end_pos = dl->bounds.right_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5190
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5191 calculate_baseline (&data);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5192
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5193 dl->ascent = data.new_ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5194 dl->descent = data.new_descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5195
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5196 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5197 unsigned short ascent = (unsigned short) XINT (w->minimum_line_ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5198
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5199 if (dl->ascent < ascent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5200 dl->ascent = ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5201 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5202 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5203 unsigned short descent = (unsigned short) XINT (w->minimum_line_descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5204
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5205 if (dl->descent < descent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5206 dl->descent = descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5207 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5208
819
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5209 calculate_yoffset (dl, db);
6504113e7c2d [xemacs-hg @ 2002-04-25 18:03:23 by andyp]
andyp
parents: 800
diff changeset
5210
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5211 dl->cursor_elt = data.cursor_x;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5212 /* #### lossage lossage lossage! Fix this shit! */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5213 if (data.byte_charpos > byte_string_zv)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5214 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
5215 byte_string_zv);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5216 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5217 dl->end_charpos =
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5218 buffer_or_string_bytexpos_to_charxpos (disp_string,
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5219 data.byte_charpos) - 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5220 if (truncate_win)
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
5221 data.dl->num_chars =
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5222 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
5223 b ? XINT (b->tab_width) : 8);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5224 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5225 /* This doesn't correctly take into account tabs and control
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5226 characters but if the window isn't being truncated then this
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5227 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
5228 data.dl->num_chars = dl->end_charpos - dl->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5229
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5230 /* #### handle horizontally scrolled line with text none of which
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5231 was actually laid out. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5232
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5233 /* #### handle any remainder of overlay arrow */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5234
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5235 if (*prop == ADD_FAILED)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5236 *prop = NULL;
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 if (truncate_win && *prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5239 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5240 Dynarr_free (*prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5241 *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5242 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5243
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5244 extent_fragment_delete (data.ef);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5245
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5246 /* #### 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
5247 it so that regenerate_window will exit properly. This is bogus.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5248 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
5249 this function if we are already at EOB. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5250
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5251 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
5252 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
5253 data.byte_charpos) + 1; /* Yuck! */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5254 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5255 return string_index_byte_to_char (disp_string, data.byte_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5256 }
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 /* Given a display line and a starting position, ensure that the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5259 contents of the display line accurately represent the visual
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5260 representation of the buffer contents starting from the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5261 position when displayed in the given window. The display line ends
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5262 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
5263 window.
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
5264
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5265 This is very similar to generate_display_line but with the same
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5266 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
5267 of fixing the bytebpos stuff though.*/
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5268
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5269 static Charbpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5270 generate_string_display_line (struct window *w, Lisp_Object disp_string,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5271 struct display_line *dl,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5272 Charcount start_pos,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5273 prop_block_dynarr **prop,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5274 face_index default_face)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5275 {
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5276 Charcount ret_charcount;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5277
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5278 /* you must set bounds before calling this. */
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
5279
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5280 /* Reset what this line is using. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5281 if (dl->display_blocks)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5282 Dynarr_reset (dl->display_blocks);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5283 if (dl->left_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5284 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5285 Dynarr_free (dl->left_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5286 dl->left_glyphs = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5287 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5288 if (dl->right_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5289 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5290 Dynarr_free (dl->right_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5291 dl->right_glyphs = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5292 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5293
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5294 /* We aren't generating a modeline at the moment. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5295 dl->modeline = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5296
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5297 /* 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
5298 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
5299 prop, default_face);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5300 dl->charpos = start_pos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5301 if (dl->end_charpos < dl->charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5302 dl->end_charpos = dl->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5303
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5304 /* If there are left glyphs associated with any character in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5305 text block, then create a display block to handle them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5306 if (dl->left_glyphs != NULL && Dynarr_length (dl->left_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5307 create_left_glyph_block (w, dl, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5308
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5309 /* If there are right glyphs associated with any character in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5310 text block, then create a display block to handle them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5311 if (dl->right_glyphs != NULL && Dynarr_length (dl->right_glyphs))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5312 create_right_glyph_block (w, dl);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5313
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5314 return ret_charcount;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5315 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5316
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5317 /* 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
5318 loop through elements in the string creating display lines until we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5319 have covered the provided area. Simple really. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5320 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5321 generate_displayable_area (struct window *w, Lisp_Object disp_string,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5322 int xpos, int ypos, int width, int height,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5323 display_line_dynarr* dla,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5324 Charcount start_pos,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5325 face_index default_face)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5326 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5327 int yend = ypos + height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5328 Charcount s_zv;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5329
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5330 prop_block_dynarr *prop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5331 layout_bounds bounds;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5332 assert (dla);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5333
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5334 Dynarr_reset (dla);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5335 /* 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
5336 there is something to do. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5337 if (NILP (disp_string))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5338 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5339
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5340 s_zv = string_char_length (disp_string);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5341
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5342 bounds.left_out = xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5343 bounds.right_out = xpos + width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5344 /* The inner boundaries mark where the glyph margins are located. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5345 bounds.left_in = bounds.left_out + window_left_margin_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5346 bounds.right_in = bounds.right_out - window_right_margin_width (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5347 /* We cannot fully calculate the whitespace boundaries as they
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5348 depend on the contents of the line being displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5349 bounds.left_white = bounds.left_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5350 bounds.right_white = bounds.right_in;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5351
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5352 while (ypos < yend)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5353 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5354 struct display_line dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5355 struct display_line *dlp;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5356 Charcount next_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5357 int local;
851
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5358 int pos_of_dlp = -1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5359
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5360 if (Dynarr_length (dla) < Dynarr_largest (dla))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5361 {
851
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5362 pos_of_dlp = Dynarr_length (dla);
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5363 dlp = Dynarr_atp (dla, pos_of_dlp);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5364 local = 0;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5367 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5368
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5369 xzero (dl);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5370 dlp = &dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5371 local = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5372 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5373
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5374 dlp->bounds = bounds;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5375 dlp->offset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5376 next_pos = generate_string_display_line (w, disp_string, dlp, start_pos,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5377 &prop, default_face);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5378 /* we need to make sure that we continue along the line if there
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5379 is more left to display otherwise we just end up redisplaying
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5380 the same chunk over and over again. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5381 if (next_pos == start_pos && next_pos < s_zv)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5382 start_pos++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5383 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5384 start_pos = next_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5385
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5386 dlp->ypos = ypos + dlp->ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5387 ypos = dlp->ypos + dlp->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5388
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5389 if (ypos > yend)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5390 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5391 int visible_height = dlp->ascent + dlp->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5392
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5393 dlp->clip = (ypos - yend);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5394 visible_height -= dlp->clip;
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 if (visible_height < VERTICAL_CLIP (w, 1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5397 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5398 if (local)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5399 free_display_line (dlp);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5400 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5401 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5402 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5403 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5404 dlp->clip = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5405
851
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5406 assert (pos_of_dlp < 0 || pos_of_dlp == Dynarr_length (dla));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5407 Dynarr_add (dla, *dlp);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5408
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5409 /* #### This type of check needs to be done down in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5410 generate_display_line call. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5411 if (start_pos >= s_zv)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5412 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5413 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5414
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5415 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5416 Dynarr_free (prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5417 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5418
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5419
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5420 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5421 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5422 /* window-regeneration routines */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5423 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5424 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5425
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5426 /* For a given window and starting position in the buffer it contains,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5427 ensure that the TYPE display lines accurately represent the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5428 presentation of the window. We pass the buffer instead of getting
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5429 it from the window since redisplay_window may have temporarily
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5430 changed it to the echo area buffer. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5431
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5432 static void
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5433 regenerate_window (struct window *w, Charbpos start_pos, Charbpos point, int type)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5434 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5435 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5436 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5437 int ypos = WINDOW_TEXT_TOP (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5438 int yend; /* set farther down */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5439 int yclip = WINDOW_TEXT_TOP_CLIP (w);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5440 int force;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5441
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5442 prop_block_dynarr *prop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5443 layout_bounds bounds;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5444 display_line_dynarr *dla;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5445 int need_modeline;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5446
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5447 /* The lines had better exist by this point. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5448 if (!(dla = window_display_lines (w, type)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5449 abort ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5450 Dynarr_reset (dla);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5451 w->max_line_len = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5452
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5453 /* Normally these get updated in redisplay_window but it is possible
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5454 for this function to get called from some other points where that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5455 update may not have occurred. This acts as a safety check. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5456 if (!Dynarr_length (w->face_cachels))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5457 reset_face_cachels (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5458 if (!Dynarr_length (w->glyph_cachels))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5459 reset_glyph_cachels (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5460
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5461 Fset_marker (w->start[type], make_int (start_pos), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5462 Fset_marker (w->pointm[type], make_int (point), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5463 w->last_point_x[type] = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5464 w->last_point_y[type] = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5465
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5466 /* Make sure a modeline is in the structs if needed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5467 need_modeline = ensure_modeline_generated (w, type);
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 /* 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
5470 generated in the case where one didn't exist. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5471 yend = WINDOW_TEXT_BOTTOM (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5472
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5473 bounds = calculate_display_line_boundaries (w, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5474
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5475 /* 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
5476 if (MINI_WINDOW_P (w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5477 && (!NILP (Vminibuf_prompt) || !NILP (Vminibuf_preprompt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5478 && !echo_area_active (f)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5479 && start_pos == BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5480 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5481 struct prop_block pb;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5482 Lisp_Object string;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5483 prop = Dynarr_new (prop_block);
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 string = concat2(Vminibuf_preprompt, Vminibuf_prompt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5486 pb.type = PROP_MINIBUF_PROMPT;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5487 pb.data.p_string.str = XSTRING_DATA(string);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5488 pb.data.p_string.len = XSTRING_LENGTH(string);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5489 Dynarr_add (prop, pb);
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5492 prop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5493
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5494 /* When we are computing things for scrolling purposes, make
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5495 sure at least one line is always generated */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5496 force = (type == CMOTION_DISP);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5497
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5498 /* Make sure this is set always */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5499 /* Note the conversion at end */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5500 w->window_end_pos[type] = start_pos;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5501 while (ypos < yend || force)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5502 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5503 struct display_line dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5504 struct display_line *dlp;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5505 int local;
851
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5506 int pos_of_dlp = -1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5507
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5508 if (Dynarr_length (dla) < Dynarr_largest (dla))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5509 {
851
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5510 pos_of_dlp = Dynarr_length (dla);
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5511 dlp = Dynarr_atp (dla, pos_of_dlp);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5512 local = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5513 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5514 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5515 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5516
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5517 xzero (dl);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5518 dlp = &dl;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5519 local = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5520 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5521
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5522 dlp->bounds = bounds;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5523 dlp->offset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5524 start_pos = generate_display_line (w, dlp, 1, start_pos, &prop, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5525
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5526 if (yclip > dlp->ascent)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5527 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5528 /* this should never happen, but if it does just display the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5529 whole line */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5530 yclip = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5531 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5532
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5533 dlp->ypos = (ypos + dlp->ascent) - yclip;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5534 ypos = dlp->ypos + dlp->descent;
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 /* See if we've been asked to start midway through a line, for
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5537 partial display line scrolling. */
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
5538 if (yclip)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5539 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5540 dlp->top_clip = yclip;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5541 yclip = 0;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5544 dlp->top_clip = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5545
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5546 if (ypos > yend)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5547 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5548 int visible_height = dlp->ascent + dlp->descent;
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->clip = (ypos - yend);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5551 /* Although this seems strange we could have a single very
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5552 tall line visible for which we need to account for both
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5553 the top clip and the bottom clip. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5554 visible_height -= (dlp->clip + dlp->top_clip);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5555
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5556 if (visible_height < VERTICAL_CLIP (w, 1) && !force)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5557 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5558 if (local)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5559 free_display_line (dlp);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5560 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5561 }
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5564 dlp->clip = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5565
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5566 if (dlp->cursor_elt != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5567 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5568 /* #### This check is steaming crap. Have to get things
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5569 fixed so when create_text_block hits EOB, we're done,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5570 period. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5571 if (w->last_point_x[type] == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5572 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5573 w->last_point_x[type] = dlp->cursor_elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5574 w->last_point_y[type] = Dynarr_length (dla);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5575 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5576 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5577 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5578 /* #### This means that we've added a cursor at EOB
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5579 twice. Yuck oh yuck. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5580 struct display_block *db =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5581 get_display_block_from_line (dlp, TEXT);
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 Dynarr_atp (db->runes, dlp->cursor_elt)->cursor_type = NO_CURSOR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5584 dlp->cursor_elt = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5585 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5586 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5587
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5588 if (dlp->num_chars > w->max_line_len)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5589 w->max_line_len = dlp->num_chars;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5590
851
e7ee5f8bde58 [xemacs-hg @ 2002-05-23 11:46:08 by ben]
ben
parents: 826
diff changeset
5591 assert (pos_of_dlp < 0 || pos_of_dlp == Dynarr_length (dla));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5592 Dynarr_add (dla, *dlp);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5593
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5594 /* #### This isn't right, but it is close enough for now. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5595 w->window_end_pos[type] = start_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5596
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5597 /* #### This type of check needs to be done down in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5598 generate_display_line call. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5599 if (start_pos > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5600 break;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5601
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5602 force = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5603 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5604
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5605 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5606 Dynarr_free (prop);
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 /* #### More not quite right, but close enough. */
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5609 /* Ben sez: apparently window_end_pos[] is measured
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5610 as the number of characters between the window end and the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5611 end of the buffer? This seems rather weirdo. What's
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5612 the justification for this?
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5613
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5614 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
5615 that can change. This representation allows initalizing with 0.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5616 */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5617 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
5618
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5619 if (need_modeline)
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 /* We know that this is the right thing to use because we put it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5622 there when we first started working in this function. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5623 generate_modeline (w, Dynarr_atp (dla, 0), type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5624 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5625 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5626
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5627 #define REGEN_INC_FIND_START_END \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5628 do { \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5629 /* Determine start and end of lines. */ \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5630 if (!Dynarr_length (cdla)) \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5631 return 0; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5632 else \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5633 { \
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5634 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
5635 { \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5636 dla_start = 1; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5637 } \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5638 else if (!Dynarr_atp (cdla, 0)->modeline \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5639 && !Dynarr_atp (ddla, 0)->modeline) \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5640 { \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5641 dla_start = 0; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5642 } \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5643 else \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5644 abort (); /* structs differ */ \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5645 \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5646 dla_end = Dynarr_length (cdla) - 1; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5647 } \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5648 \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5649 start_pos = (Dynarr_atp (cdla, dla_start)->charpos \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5650 + Dynarr_atp (cdla, dla_start)->offset); \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5651 /* 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
5652 full regen. */ \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5653 if (startp != start_pos) \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5654 return 0; \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5655 \
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5656 /* 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
5657 if (pointm < start_pos) \
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 \
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5660 } while (0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5661
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5662 /* This attempts to incrementally update the display structures. It
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5663 returns a boolean indicating success or failure. This function is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5664 very similar to regenerate_window_incrementally and is in fact only
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5665 called from that function. However, because of the nature of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5666 changes it deals with it sometimes makes different assumptions
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5667 which can lead to success which are much more difficult to make
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5668 when dealing with buffer changes. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5669
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5670 static int
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5671 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
5672 Charbpos pointm,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5673 Charcount beg_unchanged,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5674 Charcount end_unchanged)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5675 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5676 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5677 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5678 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5679
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5680 int dla_start = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5681 int dla_end, line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5682 int first_line, last_line;
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5683 Charbpos start_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5684 /* 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
5685 definitely want its value to survive between passes. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5686 prop_block_dynarr *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5687
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5688 /* 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
5689 been incremented, then fail. I'm not sure of the exact circumstances
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5690 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
5691 reasonable happening. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5692 if (!point_visible (w, pointm, CURRENT_DISP)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5693 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5694 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5695
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5696 /* 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
5697 go ahead and proceed with the optimization attempt. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5698 if (!EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5699 || pointm != marker_position (w->last_point[CURRENT_DISP]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5700 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5701 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5702 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5703 struct frame *sel_f = device_selected_frame (d);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5704 int success = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5705
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5706 if (w->last_point_x[CURRENT_DISP] != -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5707 && w->last_point_y[CURRENT_DISP] != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5708 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5709
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5710 if (redisplay_move_cursor (w, pointm, WINDOW_TTY_P (w)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5711 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5712 /* Always regenerate the modeline in case it is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5713 displaying the current line or column. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5714 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5715 success = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5716 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5717 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5718 else if (w != XWINDOW (FRAME_SELECTED_WINDOW (sel_f)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5719 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5720 if (f->modeline_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5721 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5722 success = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5723 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5724
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5725 if (!success)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5726 return 0;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5729 if (beg_unchanged == -1 && end_unchanged == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5730 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5731
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5732 /* assert: There are no buffer modifications or they are all below the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5733 visible region. We assume that regenerate_window_incrementally has
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5734 not called us unless this is true. */
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 REGEN_INC_FIND_START_END;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5737
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5738 /* If the changed are starts before the visible area, give up. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5739 if (beg_unchanged < startp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5740 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5741
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5742 /* Find what display line the extent changes first affect. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5743 line = dla_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5744 while (line <= dla_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5745 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5746 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
5747 Charbpos lstart = dl->charpos + dl->offset;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5748 Charbpos lend = dl->end_charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5749
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5750 if (beg_unchanged >= lstart && beg_unchanged <= lend)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5751 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5752
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5753 line++;
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 the changes are below the visible area then if point hasn't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5757 moved return success otherwise fail in order to be safe. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5758 if (line > dla_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5759 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5760 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5761 && pointm == marker_position (w->last_point[CURRENT_DISP]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5762 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5763 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5764 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5765 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5766
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5767 /* 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
5768 begin redrawing lines as long as we are still in the affected
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5769 region and the line's size and positioning don't change.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5770 Otherwise we fail. If we fail we will have altered the desired
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5771 structs which could lead to an assertion failure. However, if we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5772 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
5773 will actually end up being safe. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5774 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5775 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5776 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5777 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5778
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5779 first_line = last_line = line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5780 while (line <= dla_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5781 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5782 Charbpos old_start, old_end, new_start;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5783 struct display_line *cdl = Dynarr_atp (cdla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5784 struct display_line *ddl = Dynarr_atp (ddla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5785 struct display_block *db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5786 int initial_size;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5787
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5788 assert (cdl->charpos == ddl->charpos);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5789 assert (cdl->end_charpos == ddl->end_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5790 assert (cdl->offset == ddl->offset);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5791
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5792 db = get_display_block_from_line (ddl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5793 initial_size = Dynarr_length (db->runes);
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5794 old_start = ddl->charpos + ddl->offset;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5795 old_end = ddl->end_charpos + ddl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5796
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5797 /* If this is the first line being updated and it used
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5798 propagation data, fail. Otherwise we'll be okay because
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5799 we'll have the necessary propagation data. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5800 if (line == first_line && ddl->used_prop_data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5801 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5802
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5803 new_start = generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5804 &prop, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5805 ddl->offset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5806
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5807 /* #### If there is propagated stuff the fail. We could
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5808 probably actually deal with this if the line had propagated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5809 information when originally created by a full
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5810 regeneration. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5811 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5812 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5813 Dynarr_free (prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5814 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5815 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5816
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5817 /* If any line position parameters have changed or a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5818 cursor has disappeared or disappeared, fail. */
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 if (cdl->ypos != ddl->ypos
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5821 || cdl->ascent != ddl->ascent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5822 || cdl->descent != ddl->descent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5823 || cdl->top_clip != ddl->top_clip
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5824 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5825 || (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
5826 || old_start != ddl->charpos
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5827 || old_end != ddl->end_charpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5828 || initial_size != Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5829 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5830 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5831 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5832
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5833 if (ddl->cursor_elt != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5834 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5835 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5836 w->last_point_y[DESIRED_DISP] = line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5837 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5838
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5839 last_line = line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5840
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5841 /* If the extent changes end on the line we just updated then
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5842 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
5843 if (end_unchanged <= ddl->end_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5844 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5845 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5846 line++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5847 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5848
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5849 redisplay_update_line (w, first_line, last_line, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5850 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5851 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5852
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5853 /* Attempt to update the display data structures based on knowledge of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5854 the changed region in the buffer. Returns a boolean indicating
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5855 success or failure. If this function returns a failure then a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5856 regenerate_window _must_ be performed next in order to maintain
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5857 invariants located here. */
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 static int
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5860 regenerate_window_incrementally (struct window *w, Charbpos startp,
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5861 Charbpos pointm)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5862 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5863 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5864 display_line_dynarr *cdla = window_display_lines (w, CURRENT_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5865 display_line_dynarr *ddla = window_display_lines (w, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5866 Charcount beg_unchanged, end_unchanged;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5867 Charcount extent_beg_unchanged, extent_end_unchanged;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5868
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5869 int dla_start = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5870 int dla_end, line;
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5871 Charbpos start_pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5872
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5873 /* If this function is called, the current and desired structures
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5874 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
5875 assert (Dynarr_length (cdla) == Dynarr_length (ddla));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5876
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5877 /* We don't handle minibuffer windows yet. The minibuffer prompt
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5878 screws us up. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5879 if (MINI_WINDOW_P (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5880 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5881
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5882 extent_beg_unchanged = BUF_EXTENT_BEGIN_UNCHANGED (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5883 extent_end_unchanged = (BUF_EXTENT_END_UNCHANGED (b) == -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5884 ? -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5885 : BUF_Z (b) - BUF_EXTENT_END_UNCHANGED (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5886
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5887 /* 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
5888 and succeed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5889 if (BUF_BEGIN_UNCHANGED (b) == -1 && BUF_END_UNCHANGED (b) == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5890 return regenerate_window_extents_only_changed (w, startp, pointm,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5891 extent_beg_unchanged,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5892 extent_end_unchanged);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5893
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5894 /* We can't deal with deleted newlines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5895 if (BUF_NEWLINE_WAS_DELETED (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5896 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5897
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5898 beg_unchanged = BUF_BEGIN_UNCHANGED (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5899 end_unchanged = (BUF_END_UNCHANGED (b) == -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5900 ? -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5901 : BUF_Z (b) - BUF_END_UNCHANGED (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5902
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5903 REGEN_INC_FIND_START_END;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5904
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5905 /* If the changed area starts before the visible area, give up. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5906 if (beg_unchanged < startp)
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 /* Find what display line the buffer changes first affect. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5910 line = dla_start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5911 while (line <= dla_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5912 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5913 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
5914 Charbpos lstart = dl->charpos + dl->offset;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5915 Charbpos lend = dl->end_charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5916
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5917 if (beg_unchanged >= lstart && beg_unchanged <= lend)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5918 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5919
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5920 line++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5921 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5922
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5923 /* 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
5924 moved return success otherwise fail in order to be safe. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5925 if (line > dla_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5926 return regenerate_window_extents_only_changed (w, startp, pointm,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5927 extent_beg_unchanged,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5928 extent_end_unchanged);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5929 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5930 /* At this point we know what line the changes first affect. We
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5931 now redraw that line. If the changes are contained within it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5932 we are going to succeed and can update just that one line.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5933 Otherwise we fail. If we fail we will have altered the desired
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5934 structs which could lead to an assertion failure. However, if
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5935 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
5936 so we will actually end up being safe. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5937 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
5938 Charbpos new_start;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5939 prop_block_dynarr *prop = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5940 struct display_line *cdl = Dynarr_atp (cdla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5941 struct display_line *ddl = Dynarr_atp (ddla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5942
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5943 assert (cdl->charpos == ddl->charpos);
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5944 assert (cdl->end_charpos == ddl->end_charpos);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5945 assert (cdl->offset == ddl->offset);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5946
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5947 /* If the line continues to next display line, fail. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5948 if (ddl->line_continuation)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5949 return 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5950
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5951 /* If the line was generated using propagation data, fail. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5952 if (ddl->used_prop_data)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5953 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5954
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5955 new_start = generate_display_line (w, ddl, 0, ddl->charpos + ddl->offset,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5956 &prop, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5957 ddl->offset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5958
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5959 /* If there is propagated stuff then it is pretty much a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5960 guarantee that more than just the one line is affected. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5961 if (prop)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5962 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5963 Dynarr_free (prop);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5964 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5965 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5966
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5967 /* If the line continues to next display line, fail. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5968 if (ddl->line_continuation)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
5969 return 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5970
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5971 /* If any line position parameters have changed or a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5972 cursor has disappeared or disappeared, fail. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5973 if (cdl->ypos != ddl->ypos
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5974 || cdl->ascent != ddl->ascent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5975 || cdl->descent != ddl->descent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5976 || cdl->top_clip != ddl->top_clip
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5977 || (cdl->cursor_elt != -1 && ddl->cursor_elt == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5978 || (cdl->cursor_elt == -1 && ddl->cursor_elt != -1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5979 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5980 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5981 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5982
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5983 /* If the changed area also ends on this line, then we may be in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5984 business. Update everything and return success. */
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
5985 if (end_unchanged >= ddl->charpos && end_unchanged <= ddl->end_charpos)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5986 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5987 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5988 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5989 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5990 w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5991 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5992 w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5993
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5994 if (ddl->cursor_elt != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5995 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5996 w->last_point_x[DESIRED_DISP] = ddl->cursor_elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5997 w->last_point_y[DESIRED_DISP] = line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5998 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5999
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6000 redisplay_update_line (w, line, line, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6001 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6002
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6003 /* #### For now we just flush the cache until this has been
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6004 tested. After that is done, this should correct the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6005 cache directly. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6006 Dynarr_reset (w->line_start_cache);
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 /* Adjust the extent changed boundaries to remove any
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6009 overlap with the buffer changes since we've just
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6010 successfully updated that area. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6011 if (extent_beg_unchanged != -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6012 && extent_beg_unchanged >= beg_unchanged
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6013 && extent_beg_unchanged < end_unchanged)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6014 extent_beg_unchanged = end_unchanged;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6015
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6016 if (extent_end_unchanged != -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6017 && extent_end_unchanged >= beg_unchanged
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6018 && extent_end_unchanged < end_unchanged)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6019 extent_end_unchanged = beg_unchanged - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6020
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6021 if (extent_end_unchanged <= extent_beg_unchanged)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6022 extent_beg_unchanged = extent_end_unchanged = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6023
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6024 /* This could lead to odd results if it fails, but since the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6025 buffer changes update succeeded this probably will to.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6026 We already know that the extent changes start at or after
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6027 the line because we checked before entering the loop. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6028 if (extent_beg_unchanged != -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6029 && extent_end_unchanged != -1
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6030 && ((extent_beg_unchanged < ddl->charpos)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6031 || (extent_end_unchanged > ddl->end_charpos)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6032 return regenerate_window_extents_only_changed (w, startp, pointm,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6033 extent_beg_unchanged,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6034 extent_end_unchanged);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6035 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6036 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6037 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6038 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6039
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6040 /* Oh, well. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6041 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6042 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6043
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6044 /* Given a window and a point, update the given display lines such
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6045 that point is displayed in the middle of the window.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6046 Return the window's new start position. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6047
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6048 static Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6049 regenerate_window_point_center (struct window *w, Charbpos point, int type)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6050 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6051 Charbpos startp;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6052
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6053 /* 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
6054 window height can be calculated correctly. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6055 ensure_modeline_generated (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6056
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6057 startp = start_with_line_at_pixpos (w, point, window_half_pixpos (w));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6058 regenerate_window (w, startp, point, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6059 Fset_marker (w->start[type], make_int (startp), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6060
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6061 return startp;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6062 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6063
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6064 /* Given a window and a set of display lines, return a boolean
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6065 indicating whether the given point is contained within. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6066
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6067 static int
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6068 point_visible (struct window *w, Charbpos point, int type)
428
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 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6071 display_line_dynarr *dla = window_display_lines (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6072 int first_line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6073
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6074 if (Dynarr_length (dla) && Dynarr_atp (dla, 0)->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6075 first_line = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6076 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6077 first_line = 0;
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 if (Dynarr_length (dla) > first_line)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6080 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6081 Charbpos start, end;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6082 struct display_line *dl = Dynarr_atp (dla, first_line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6083
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6084 start = dl->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6085 end = BUF_Z (b) - w->window_end_pos[type] - 1;
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 if (point >= start && point <= end)
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 if (!MINI_WINDOW_P (w) && scroll_on_clipped_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6090 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6091 dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6092
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6093 if (point >= (dl->charpos + dl->offset)
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6094 && point <= (dl->end_charpos + dl->offset))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6095 return !dl->clip;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6096 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6097 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6098 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6099 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6100 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6101 }
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 return 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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6106 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6107 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6108
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6109 /* Return pixel position the middle of the window, not including the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6110 modeline and any potential horizontal scrollbar. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6111
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6112 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6113 window_half_pixpos (struct window *w)
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 return WINDOW_TEXT_TOP (w) + (WINDOW_TEXT_HEIGHT (w) >> 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6116 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6117
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6118 /* Return the display line which is currently in the middle of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6119 window W for display lines TYPE. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6120
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6121 int
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6122 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
6123 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6124 display_line_dynarr *dla;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6125 int half;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6126 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6127 int first_elt = (MINI_WINDOW_P (w) ? 0 : 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6128
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6129 if (type == CMOTION_DISP)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6130 regenerate_window (w, start, point, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6131
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6132 dla = window_display_lines (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6133 half = window_half_pixpos (w);
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 for (elt = first_elt; elt < Dynarr_length (dla); elt++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6136 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6137 struct display_line *dl = Dynarr_atp (dla, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6138 int line_bot = dl->ypos + dl->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6139
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6140 if (line_bot > half)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6141 return elt;
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 /* 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
6145 being displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6146 return -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6147 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6148
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6149 /* 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
6150 the line which is in the middle of the window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6151
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6152 Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6153 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
6154 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6155 /* line_at_center will regenerate the display structures, if necessary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6156 int line = line_at_center (w, type, start, point);
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 if (line == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6159 return BUF_ZV (XBUFFER (w->buffer));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6160 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6161 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6162 display_line_dynarr *dla = window_display_lines (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6163 struct display_line *dl = Dynarr_atp (dla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6164
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
6165 return dl->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6166 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6167 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6168
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6169 /* For a given window, ensure that the current visual representation
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6170 is accurate. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6171
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6172 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6173 redisplay_window (Lisp_Object window, int skip_selected)
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 struct window *w = XWINDOW (window);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6176 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6177 struct device *d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6178 Lisp_Object old_buffer = w->buffer;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6179 Lisp_Object the_buffer = w->buffer;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6180 struct buffer *b;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6181 int echo_active = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6182 int startp = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6183 int pointm;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6184 int old_startp = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6185 int old_pointm = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6186 int selected_in_its_frame;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6187 int selected_globally;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6188 int skip_output = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6189 int truncation_changed;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6190 int inactive_minibuffer =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6191 (MINI_WINDOW_P (w) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6192 (f != device_selected_frame (d)) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6193 !is_surrogate_for_selected_frame (f));
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 /* #### In the new world this function actually does a bunch of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6196 optimizations such as buffer-based scrolling, but none of that is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6197 implemented yet. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6198
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6199 /* If this is a combination window, do its children; that's all.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6200 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
6201 skip_selected here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6202 if (!NILP (w->vchild))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6203 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6204 redisplay_windows (w->vchild, skip_selected);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6205 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6206 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6207 if (!NILP (w->hchild))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6208 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6209 redisplay_windows (w->hchild, skip_selected);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6210 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6211 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6212
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6213 /* Is this window the selected window on its frame? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6214 selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6215 selected_globally =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6216 selected_in_its_frame &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6217 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6218 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6219 XFRAME(DEVICE_SELECTED_FRAME(d)) == f;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6220 if (skip_selected && selected_in_its_frame)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6221 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6222
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6223 /* It is possible that the window is not fully initialized yet. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6224 if (NILP (w->buffer))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6225 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6226
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6227 if (MINI_WINDOW_P (w) && echo_area_active (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6228 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6229 w->buffer = the_buffer = Vecho_area_buffer;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6230 echo_active = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6231 }
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 b = XBUFFER (w->buffer);
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 if (echo_active)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6236 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6237 old_pointm = selected_globally
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6238 ? BUF_PT (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6239 : marker_position (w->pointm[CURRENT_DISP]);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6240 pointm = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6241 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6242 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6243 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6244 if (selected_globally)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6245 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6246 pointm = BUF_PT (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6247 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6248 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6249 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6250 pointm = marker_position (w->pointm[CURRENT_DISP]);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6251
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6252 if (pointm < BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6253 pointm = BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6254 else if (pointm > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6255 pointm = BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6256 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6257 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6258 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm), the_buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6259
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6260 /* 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
6261 cache elements. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6262 if ((!echo_active && b != window_display_buffer (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6263 || !Dynarr_length (w->face_cachels)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6264 || f->faces_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6265 reset_face_cachels (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6266 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6267 mark_face_cachels_as_not_updated (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6268
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6269 /* Ditto the glyph cache elements, although we do *not* invalidate
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6270 the cache purely because glyphs have changed - this is now
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6271 handled by the dirty flag.*/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6272 if ((!echo_active && b != window_display_buffer (w))
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6273 || !Dynarr_length (w->glyph_cachels) || f->faces_changed)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6274 reset_glyph_cachels (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6275 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6276 mark_glyph_cachels_as_not_updated (w);
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 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
6279 to find a new starting position. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6280 if (!MINI_WINDOW_P (w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6281 && !EQ (Fmarker_buffer (w->start[CURRENT_DISP]), w->buffer))
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 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6284
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6285 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6286 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6287
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6288 if (echo_active)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6289 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6290 old_startp = marker_position (w->start[CURRENT_DISP]);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6291 startp = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6292 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6293 else
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 startp = marker_position (w->start[CURRENT_DISP]);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6296 if (startp < BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6297 startp = BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6298 else if (startp > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6299 startp = BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6300 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6301 Fset_marker (w->start[DESIRED_DISP], make_int (startp), the_buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6302
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6303 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
6304 (unsigned int) window_truncation_on (w));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6305
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6306 /* 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
6307 should display from there and change point, if necessary, to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6308 ensure that it is visible. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6309 if (w->force_start || inactive_minibuffer)
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 w->force_start = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6312 w->last_modified[DESIRED_DISP] = Qzero;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6313 w->last_facechange[DESIRED_DISP] = Qzero;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6314
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6315 regenerate_window (w, startp, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6316
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6317 if (!point_visible (w, pointm, DESIRED_DISP) && !inactive_minibuffer)
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 pointm = point_at_center (w, DESIRED_DISP, 0, 0);
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 if (selected_globally)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6322 BUF_SET_PT (b, pointm);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6323
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6324 Fset_marker (w->pointm[DESIRED_DISP], make_int (pointm),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6325 the_buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6326
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6327 /* #### BUFU amounts of overkill just to get the cursor
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6328 location marked properly. FIX ME FIX ME FIX ME */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6329 regenerate_window (w, startp, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6330 }
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 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6333 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6334
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6335 /* If nothing has changed since the last redisplay, then we just
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6336 need to make sure that point is still visible. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6337 if (XINT (w->last_modified[CURRENT_DISP]) >= BUF_MODIFF (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6338 && XINT (w->last_facechange[CURRENT_DISP]) >= BUF_FACECHANGE (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6339 && pointm >= startp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6340 /* This check is to make sure we restore the minibuffer after a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6341 temporary change to the echo area. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6342 && !(MINI_WINDOW_P (w) && f->buffers_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6343 && !f->frame_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6344 && !truncation_changed
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6345 /* 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
6346 && (!w->start_at_line_beg || beginning_of_line_p (b, startp))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6347 )
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6348 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6349 /* Check if the cursor has actually moved. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6350 if (EQ (Fmarker_buffer (w->last_point[CURRENT_DISP]), w->buffer)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6351 && pointm == marker_position (w->last_point[CURRENT_DISP])
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6352 && selected_globally
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6353 && !w->windows_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6354 && !f->clip_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6355 && !f->extents_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6356 && !f->faces_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6357 && !f->glyphs_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6358 && !f->subwindows_changed
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6359 /* && !f->subwindows_state_changed*/
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6360 && !f->point_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6361 && !f->windows_structure_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6362 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6363 /* If not, we're done. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6364 if (f->modeline_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6365 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6366
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6367 skip_output = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6368 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6369 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6370 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6371 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6372 /* If the new point is visible in the redisplay structures,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6373 then let the output update routines handle it, otherwise
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6374 do things the hard way. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6375 if (!w->windows_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6376 && !f->clip_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6377 && !f->extents_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6378 && !f->faces_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6379 && !f->glyphs_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6380 && !f->subwindows_changed
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6381 /* && !f->subwindows_state_changed*/
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6382 && !f->windows_structure_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6383 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6384 if (point_visible (w, pointm, CURRENT_DISP)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6385 && w->last_point_x[CURRENT_DISP] != -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6386 && w->last_point_y[CURRENT_DISP] != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6387 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6388 if (redisplay_move_cursor (w, pointm, FRAME_TTY_P (f)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6389 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6390 /* Always regenerate in case it is displaying
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6391 the current line or column. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6392 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6393
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6394 skip_output = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6395 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6396 }
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 else if (!selected_in_its_frame && !f->point_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6399 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6400 if (f->modeline_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6401 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6402
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6403 skip_output = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6404 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6405 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6406 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6407
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6408 /* If we weren't able to take the shortcut method, then use
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6409 the brute force method. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6410 regenerate_window (w, startp, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6411
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6412 if (point_visible (w, pointm, DESIRED_DISP))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6413 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6414 }
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6417 /* 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
6418 line, in which case find a new starting point. We also recenter
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6419 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
6420 up with a blank window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6421 else if (((w->start_at_line_beg || MINI_WINDOW_P (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6422 && !(startp == BUF_BEGV (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6423 || BUF_FETCH_CHAR (b, startp - 1) == '\n'))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6424 || (pointm == startp &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6425 EQ (Fmarker_buffer (w->last_start[CURRENT_DISP]), w->buffer) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6426 startp < marker_position (w->last_start[CURRENT_DISP]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6427 || (startp == BUF_ZV (b)))
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 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6430
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6431 goto regeneration_done;
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 /* See if we can update the data structures locally based on
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6434 knowledge of what changed in the buffer. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6435 else if (!w->windows_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6436 && !f->clip_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6437 && !f->faces_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6438 && !f->glyphs_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6439 && !f->subwindows_changed
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6440 /* && !f->subwindows_state_changed*/
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6441 && !f->windows_structure_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6442 && !f->frame_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6443 && !truncation_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6444 && pointm >= startp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6445 && regenerate_window_incrementally (w, startp, pointm))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6446 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6447 if (f->modeline_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6448 || XINT (w->last_modified[CURRENT_DISP]) < BUF_MODIFF (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6449 || XINT (w->last_facechange[CURRENT_DISP]) < BUF_FACECHANGE (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6450 regenerate_modeline (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6451
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6452 skip_output = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6453 goto regeneration_done;
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 /* #### This is where a check for structure based scrolling would go. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6456 /* If all else fails, try just regenerating and see what happens. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6457 else
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 regenerate_window (w, startp, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6460
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6461 if (point_visible (w, pointm, DESIRED_DISP))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6462 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6463 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6464
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6465 /* We still haven't gotten the window regenerated with point
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6466 visible. Next we try scrolling a little and see if point comes
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6467 back onto the screen. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6468 if (scroll_step > 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6469 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6470 int scrolled = scroll_conservatively;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6471 for (; scrolled >= 0; scrolled -= scroll_step)
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 startp = vmotion (w, startp,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6474 (pointm < startp) ? -scroll_step : scroll_step, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6475 regenerate_window (w, startp, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6476
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6477 if (point_visible (w, pointm, DESIRED_DISP))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6478 goto regeneration_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6479 }
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6482 /* 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
6483 the screen, so just center it and be done with it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6484 startp = regenerate_window_point_center (w, pointm, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6485
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 regeneration_done:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6488
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6489 /* If the window's frame is changed then reset the current display
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6490 lines in order to force a full repaint. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6491 if (f->frame_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6492 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6493 display_line_dynarr *cla = window_display_lines (w, CURRENT_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6494
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6495 Dynarr_reset (cla);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6496 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6497
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6498 /* Must do this before calling redisplay_output_window because it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6499 sets some markers on the window. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6500 if (echo_active)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6501 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6502 w->buffer = old_buffer;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6503 Fset_marker (w->pointm[DESIRED_DISP], make_int (old_pointm), old_buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6504 Fset_marker (w->start[DESIRED_DISP], make_int (old_startp), old_buffer);
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 /* These also have to be set before calling redisplay_output_window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6508 since it sets the CURRENT_DISP values based on them. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6509 w->last_modified[DESIRED_DISP] = make_int (BUF_MODIFF (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6510 w->last_facechange[DESIRED_DISP] = make_int (BUF_FACECHANGE (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6511 Fset_marker (w->last_start[DESIRED_DISP], make_int (startp), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6512 Fset_marker (w->last_point[DESIRED_DISP], make_int (pointm), w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6513
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6514 if (!skip_output)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6515 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6516 Charbpos start = marker_position (w->start[DESIRED_DISP]);
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
6517 Charbpos end = (w->window_end_pos[DESIRED_DISP] == -1
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6518 ? BUF_ZV (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6519 : BUF_Z (b) - w->window_end_pos[DESIRED_DISP] - 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6520 /* Don't pollute the cache if not sure if we are correct */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6521 if (w->start_at_line_beg)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6522 update_line_start_cache (w, start, end, pointm, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6523 redisplay_output_window (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6524 /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6525 * If we just displayed the echo area, the line start cache is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6526 * no longer valid, because the minibuffer window is associated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6527 * with the window now.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6528 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6529 if (echo_active)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6530 w->line_cache_last_updated = make_int (-1);
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 /* #### This should be dependent on face changes and will need to be
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6534 somewhere else once tty updates occur on a per-frame basis. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6535 mark_face_cachels_as_clean (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6536
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
6537 /* The glyph cachels only get dirty if someone changed something.
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
6538 Since redisplay has now effectively ended we can reset the dirty
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
6539 flag since everything must be up-to-date. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6540 if (glyphs_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6541 mark_glyph_cachels_as_clean (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6542
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6543 w->windows_changed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6544 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6545
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6546 /* Call buffer_reset_changes for all buffers present in any window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6547 currently visible in all frames on all devices. #### There has to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6548 be a better way to do this. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6549
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6550 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6551 reset_buffer_changes_mapfun (struct window *w, void *ignored_closure)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6552 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6553 buffer_reset_changes (XBUFFER (w->buffer));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6554 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6555 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6556
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6557 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6558 reset_buffer_changes (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6559 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6560 Lisp_Object frmcons, devcons, concons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6561
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6562 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6563 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6564 struct frame *f = XFRAME (XCAR (frmcons));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6565
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6566 if (FRAME_REPAINT_P (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6567 map_windows (f, reset_buffer_changes_mapfun, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6568 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6569 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6570
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6571 /* Ensure that all windows underneath the given window in the window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6572 hierarchy are correctly displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6573
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6574 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6575 redisplay_windows (Lisp_Object window, int skip_selected)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6576 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6577 for (; !NILP (window) ; window = XWINDOW (window)->next)
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 redisplay_window (window, skip_selected);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6580 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6581 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6582
1279
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6583 /* 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
6584 Return non-zero if pre-empted. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6585
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6586 int
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6587 redisplay_frame (struct frame *f, int preemption_check)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6588 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6589 struct device *d = XDEVICE (f->device);
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6590 int depth;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6591
1279
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6592 assert (f->init_finished);
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6593
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6594 if (FRAME_STREAM_P (f)) /* nothing to do */
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6595 return 0;
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
6596
545
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6597 if (preemption_check
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6598 && !DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY))
428
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 /* The preemption check itself takes a lot of time,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6601 so normally don't do it here. We do it if called
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6602 from Lisp, though (`redisplay-frame'). */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6603 int preempted;
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_PREEMPTION_CHECK;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6606 if (preempted)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6607 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6608 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6609
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6610 if (!internal_equal (f->old_buffer_alist, f->buffer_alist, 0))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6611 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6612 Lisp_Object frame;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6613
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6614 f->old_buffer_alist = Freplace_list (f->old_buffer_alist,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6615 f->buffer_alist);
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
6616 frame = wrap_frame (f);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6617 va_run_hook_with_args (Qbuffer_list_changed_hook, 1, frame);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6618 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6619
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6620 /* Before we put a hold on frame size changes, attempt to process
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6621 any which are already pending. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6622 if (f->size_change_pending)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6623 change_frame_size (f, f->new_height, f->new_width, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6624
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6625 /* If frame size might need to be changed, due to changed size
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6626 of toolbars, scrollbars etc, change it now */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6627 if (f->size_slipped)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6628 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6629 adjust_frame_size (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6630 assert (!f->size_slipped);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6631 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6632
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6633 /* The menubar, toolbar, and icon updates must be done before
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6634 enter_redisplay_critical_section is called and we are officially
1123
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6635 'in_display'. They may eval lisp code which may call QUIT.
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6636 If in_display is set, QUIT will abort (unless the code is wrapped
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6637 to protect against errors). */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6638
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6639 #ifdef HAVE_MENUBARS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6640 /* Update the menubar. It is done first since it could change
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6641 the menubar's visibility. This way we avoid having flashing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6642 caused by an Expose event generated by the visibility change
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6643 being handled. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6644 update_frame_menubars (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6645 #endif /* HAVE_MENUBARS */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6646 #ifdef HAVE_TOOLBARS
905
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6647 /* 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
6648 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
6649 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
6650 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
6651 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
6652 - and finally update the toolbars. */
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6653 update_frame_toolbars_geometry (f);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6654 #endif /* HAVE_TOOLBARS */
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6655 /* 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
6656 size changes can occur, thus we separately update the gutter
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6657 geometry here if it needs it. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6658 update_frame_gutter_geometry (f);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6659
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6660 /* 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
6661 if (f->clear)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6662 f->frame_changed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6663
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6664 /* Invalidate the subwindow caches. We use subwindows_changed here
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6665 to cause subwindows to get instantiated. This is because
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6666 subwindows_state_changed is less strict - dealing with things
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6667 like the clicked state of button. We have to do this before
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6668 redisplaying the gutters as subwindows get unmapped in the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6669 process.*/
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6670 if (f->frame_changed)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6671 reset_frame_subwindow_instance_cache (f);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6672
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6673 if (f->frame_changed || f->subwindows_changed)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6674 {
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6675 /* we have to do this so the gutter gets regenerated. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6676 reset_gutter_display_lines (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6677 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6678
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6679 depth = enter_redisplay_critical_section ();
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6680
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6681 /* ----------------- BEGIN CRITICAL REDISPLAY SECTION ---------------- */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6682 /* Within this section, we are defenseless and assume that the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6683 following cannot happen:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6684
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6685 1) garbage collection
1123
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6686 2) QUIT
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6687 3) Any non-local exits
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6688 4) frame size changes
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6689
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6690 We ensure (4) by calling enter_redisplay_critical_section(), which
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6691 will cause any pending frame size changes to get put on hold
1123
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6692 till after the end of the critical section. (2) is required because
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6693 of the possibility of (3). (2) and (3) mean that any place that
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6694 can execute QUIT (e.g. internal_equal()), and especially any place
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6695 that executes Lisp code, need to be properly wrapped to protect
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6696 against these possibilities. This wrapping happens using
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6697 call_trapping_problems(..., INHIBIT_GC), or related functions.
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6698
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6699 To help debug potential problems, we arrange (when
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6700 ERROR_CHECK_TRAPPING_PROBLEMS is set) to crash automatically every
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6701 time we execute QUIT or check to see whether garbage collection is
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6702 necessary, inside of an unprotected critical section, as well as
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6703 further checks when we actually Fsignal(), Fthrow(),
37bdd24225ef [xemacs-hg @ 2002-11-27 07:15:02 by ben]
ben
parents: 905
diff changeset
6704 garbage_collect_1().
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6705
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6706 #### If a frame-size change does occur we should probably
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6707 actually be preempting redisplay. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6708
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6709 MAYBE_DEVMETH (d, frame_output_begin, (f));
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6710
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6711 /* 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
6712 efforts won't get undone. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6713
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6714 /* This can call lisp, but redisplay is protected by binding
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6715 inhibit_quit. More importantly the code involving display lines
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6716 *assumes* that GC will not happen and so does not GCPRO
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6717 anything. Since we use this code the whole time with the gutters
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6718 we cannot allow GC to happen when manipulating the gutters. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6719 update_frame_gutters (f);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6720
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6721 /* Erase the frame before outputting its contents. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6722 if (f->clear)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6723 {
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6724 MAYBE_DEVMETH (d, clear_frame, (f));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6725 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6726
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6727 /* Do the selected window first. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6728 redisplay_window (FRAME_SELECTED_WINDOW (f), 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6729
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6730 /* Then do the rest. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6731 redisplay_windows (f->root_window, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6732
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
6733 MAYBE_DEVMETH (d, frame_output_end, (f));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6734
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6735 update_frame_title (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6736
905
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6737 #ifdef HAVE_TOOLBARS
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6738 /* 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
6739 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
6740 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
6741 possible in a single pass. */
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6742 update_frame_toolbars (f);
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6743 #endif /* HAVE_TOOLBARS */
c15f25529e61 [xemacs-hg @ 2002-07-06 21:05:42 by andyp]
andyp
parents: 872
diff changeset
6744
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6745 CLASS_RESET_CHANGED_FLAGS (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6746 f->window_face_cache_reset = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6747 f->echo_area_garbaged = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6748 f->clear = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6749
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6750 if (!f->size_change_pending)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6751 f->size_changed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6752
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6753 /* ----------------- END CRITICAL REDISPLAY SECTION ---------------- */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6754
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6755 /* Allow frame size changes to occur again. */
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6756 exit_redisplay_critical_section (depth);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6757
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6758 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6759 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6760
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6761 /* Ensure that all frames on the given device are correctly displayed.
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6762 If AUTOMATIC is non-zero, and the device implementation indicates
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6763 no automatic redisplay, as printers do, then the device is not
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6764 redisplayed. AUTOMATIC is set to zero when called from lisp
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6765 functions (redraw-device) and (redisplay-device), and to non-zero
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6766 when called from "lazy" redisplay();
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6767 */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6768
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6769 static int
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6770 redisplay_device (struct device *d, int automatic)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6771 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6772 Lisp_Object frame, frmcons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6773 int size_change_failed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6774 struct frame *f;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6775
545
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6776 if (automatic && DEVICE_IMPL_FLAG (d, XDEVIMPF_NO_AUTO_REDISPLAY))
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6777 return 0;
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6778
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6779 if (DEVICE_STREAM_P (d)) /* nothing to do */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6780 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6781
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6782 /* 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
6783 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
6784 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
6785 device. */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6786 if (NILP (DEVICE_SELECTED_FRAME (d)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6787 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6788
545
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6789 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
6790 {
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6791 int preempted;
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6792 REDISPLAY_PREEMPTION_CHECK;
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6793 if (preempted)
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6794 return 1;
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6795 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6796
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6797 /* Always do the selected frame first. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6798 frame = DEVICE_SELECTED_FRAME (d);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6799
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6800 f = XFRAME (frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6801
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6802 if (f->icon_changed || f->windows_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6803 update_frame_icon (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6804
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6805 if (FRAME_REPAINT_P (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6806 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6807 if (CLASS_REDISPLAY_FLAGS_CHANGEDP(f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6808 {
588
ed8e2ee8d29d [xemacs-hg @ 2001-05-31 00:30:39 by kkm]
kkm
parents: 563
diff changeset
6809 int preempted = redisplay_frame (f, 1);
545
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6810 if (preempted)
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6811 return 1;
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6812 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6813
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6814 /* If the frame redisplay did not get preempted, then this flag
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6815 should have gotten set to 0. It might be possible for that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6816 not to happen if a size change event were to occur at an odd
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6817 time. To make sure we don't miss anything we simply don't
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6818 reset the top level flags until the condition ends up being
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6819 in the right state. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6820 if (f->size_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6821 size_change_failed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6822 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6823
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6824 DEVICE_FRAME_LOOP (frmcons, d)
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 f = XFRAME (XCAR (frmcons));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6827
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6828 if (f == XFRAME (DEVICE_SELECTED_FRAME (d)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6829 continue;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6830
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6831 if (f->icon_changed || f->windows_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6832 update_frame_icon (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6833
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6834 if (FRAME_REPAINT_P (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6835 {
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
6836 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6837 {
588
ed8e2ee8d29d [xemacs-hg @ 2001-05-31 00:30:39 by kkm]
kkm
parents: 563
diff changeset
6838 int preempted = redisplay_frame (f, 1);
545
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6839 if (preempted)
9a775fb11bb7 [xemacs-hg @ 2001-05-18 04:39:39 by kkm]
kkm
parents: 464
diff changeset
6840 return 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6841 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6842
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6843 if (f->size_change_pending)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6844 size_change_failed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6845 }
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6848 /* If we get here then we redisplayed all of our frames without
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6849 getting preempted so mark ourselves as clean. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6850 CLASS_RESET_CHANGED_FLAGS (d);
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 if (!size_change_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6853 d->size_changed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6854
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6855 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6856 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6857
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6858 /* Ensure that all windows on all frames on all devices are displaying
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6859 the current contents of their respective buffers. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6860
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6861 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6862 redisplay_without_hooks (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6863 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6864 Lisp_Object devcons, concons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6865 int size_change_failed = 0;
1292
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
6866 PROFILE_DECLARE ();
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
6867
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
6868 PROFILE_RECORD_ENTERING_SECTION (QSin_redisplay);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6869
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6870 if (asynch_device_change_pending)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6871 handle_asynch_device_change ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6872
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6873 if (!GLOBAL_REDISPLAY_FLAGS_CHANGEDP &&
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
6874 !disable_preemption && preemption_count < max_preempts)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6875 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6876
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6877 DEVICE_LOOP_NO_BREAK (devcons, concons)
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 struct device *d = XDEVICE (XCAR (devcons));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6880 int preempted;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6881
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
6882 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (d))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6883 {
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
6884 preempted = redisplay_device (d, 1);
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 if (preempted)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6887 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6888 preemption_count++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6889 RESET_CHANGED_SET_FLAGS;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6890 goto done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6891 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6892
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6893 /* See comment in redisplay_device. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6894 if (d->size_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6895 size_change_failed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6896 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6897 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6898 preemption_count = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6899
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6900 /* Mark redisplay as accurate */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6901 GLOBAL_RESET_CHANGED_FLAGS;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6902 RESET_CHANGED_SET_FLAGS;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6903
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6904 if (faces_changed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6905 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6906 mark_all_faces_as_clean ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6907 faces_changed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6908 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6909
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6910 if (!size_change_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6911 size_changed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6912
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6913 reset_buffer_changes ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6914
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6915 done:
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
6916 #ifdef ERROR_CHECK_DISPLAY
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
6917 sledgehammer_check_redisplay_structs ();
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
6918 #endif /* ERROR_CHECK_DISPLAY */
1292
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
6919
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
6920 PROFILE_RECORD_EXITING_SECTION (QSin_redisplay);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6921 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6922
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6923 /* Note: All places in the C code that call redisplay() are prepared
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6924 to handle GCing. However, we can't currently handle GC inside the
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6925 guts of redisplay (#### someone should fix this), so we need to use
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6926 INHIBIT_GC when calling Lisp.
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6927
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6928 #### We probably can't handle any deletion of existing buffers, frames,
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6929 windows, devices, consoles, text changes, etc. either. We should
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6930
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6931 (a) Create the appropriate INHIBIT_ flags for this.
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6932 (b) In the longer run, fix redisplay to handle this.
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6933
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6934 (#### 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
6935 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
6936 GC there, too.)
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6937 */
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6938
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6939 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6940 redisplay (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6941 {
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6942 run_pre_idle_hook ();
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6943 redisplay_no_pre_idle_hook ();
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6944 }
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6945
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6946 void
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6947 redisplay_no_pre_idle_hook (void)
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6948 {
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6949 if (last_display_warning_tick != display_warning_tick &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6950 !inhibit_warning_display)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6951 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6952 /* If an error occurs during this function, oh well.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6953 If we report another warning, we could get stuck in an
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6954 infinite loop reporting warnings. */
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6955 call0_trapping_problems
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6956 (0, Qdisplay_warning_buffer,
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6957 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6958 last_display_warning_tick = display_warning_tick;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6959 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6960
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6961 redisplay_without_hooks ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6962 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6963
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6964 Lisp_Object
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6965 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
6966 {
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6967 return
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6968 eval_in_buffer_trapping_problems
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6969 ("Error calling function within redisplay", current_buffer,
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6970 dont_trust_this_damn_sucker,
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6971 INHIBIT_GC | INHIBIT_ANY_CHANGE_AFFECTING_REDISPLAY);
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
6972 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6973
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6974 /* Efficiently determine the window line number, and return a pointer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6975 to its printed representation. Do this regardless of whether
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6976 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
6977 1. If narrowing is in effect, the lines are counted from the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6978 beginning of the visible portion of the buffer. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6979 static char *
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6980 window_line_number (struct window *w, int type)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6981 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6982 struct device *d = XDEVICE (XFRAME (w->frame)->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6983 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6984 /* Be careful in the order of these tests. The first clause will
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6985 fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be).
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6986 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
6987 Charbpos pos =
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6988 ((EQ(DEVICE_SELECTED_FRAME(d), w->frame) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6989 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame(d)))) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6990 EQ(DEVICE_CONSOLE(d), Vselected_console) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6991 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d )
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6992 ? BUF_PT (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6993 : marker_position (w->pointm[type]));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6994 EMACS_INT line;
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 line = buffer_line_number (b, pos, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6997
603
1c880911c386 [xemacs-hg @ 2001-06-01 08:23:09 by martinb]
martinb
parents: 588
diff changeset
6998 {
1c880911c386 [xemacs-hg @ 2001-06-01 08:23:09 by martinb]
martinb
parents: 588
diff changeset
6999 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
7000
1c880911c386 [xemacs-hg @ 2001-06-01 08:23:09 by martinb]
martinb
parents: 588
diff changeset
7001 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
7002
1c880911c386 [xemacs-hg @ 2001-06-01 08:23:09 by martinb]
martinb
parents: 588
diff changeset
7003 return window_line_number_buf;
1c880911c386 [xemacs-hg @ 2001-06-01 08:23:09 by martinb]
martinb
parents: 588
diff changeset
7004 }
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7005 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7006
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7007
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7008 /* Given a character representing an object in a modeline
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7009 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
7010 `mode_spec_ibyte_string') with the information that object
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7011 represents.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7012
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7013 This function is largely unchanged from previous versions of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7014 redisplay engine.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7015
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7016 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
7017 very early in the device/frame update process! JV
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7018 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7019
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7020 static void
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7021 decode_mode_spec (struct window *w, Ichar spec, int type)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7022 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7023 Lisp_Object obj = Qnil;
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7024 const char *str = NULL;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7025 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7026
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7027 Dynarr_reset (mode_spec_ibyte_string);
428
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 switch (spec)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7030 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7031 /* print buffer name */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7032 case 'b':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7033 obj = b->name;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7034 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7035
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7036 /* print visited file name */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7037 case 'f':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7038 obj = b->filename;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7039 break;
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 /* print the current column */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7042 case 'c':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7043 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7044 Charbpos pt = (w == XWINDOW (Fselected_window (Qnil)))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7045 ? BUF_PT (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7046 : marker_position (w->pointm[type]);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7047 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
7048 char buf[DECIMAL_PRINT_SIZE (long)];
428
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 long_to_string (buf, col);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7051
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7052 Dynarr_add_many (mode_spec_ibyte_string,
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7053 (const Ibyte *) buf, strlen (buf));
428
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 goto decode_mode_spec_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7056 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7057 /* print the file coding system */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7058 case 'C':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7059 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7060 Lisp_Object codesys = b->buffer_file_coding_system;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7061 /* Be very careful here not to get an error. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7062 if (NILP (codesys) || SYMBOLP (codesys) || CODING_SYSTEMP (codesys))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7063 {
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
7064 codesys = find_coding_system_for_text_file (codesys, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7065 if (CODING_SYSTEMP (codesys))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7066 obj = XCODING_SYSTEM_MNEMONIC (codesys);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7067 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7068 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7069 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7070
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7071 /* print the current line number */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7072 case 'l':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7073 str = window_line_number (w, type);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7074 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7075
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7076 /* print value of mode-name (obsolete) */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7077 case 'm':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7078 obj = b->mode_name;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7079 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7080
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7081 /* print hyphen and frame number, if != 1 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7082 case 'N':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7083 #ifdef HAVE_TTY
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 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7086 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
7087 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7088 /* Naughty, naughty */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7089 char * writable_str = alloca_array (char, 10);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7090 sprintf (writable_str, "-%d", f->order_count);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7091 str = writable_str;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7092 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7093 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7094 #endif /* HAVE_TTY */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7095 break;
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 /* print Narrow if appropriate */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7098 case 'n':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7099 if (BUF_BEGV (b) > BUF_BEG (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7100 || BUF_ZV (b) < BUF_Z (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7101 str = " Narrow";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7102 break;
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 /* print %, * or hyphen, if buffer is read-only, modified or neither */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7105 case '*':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7106 str = (!NILP (b->read_only)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7107 ? "%"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7108 : ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7109 ? "*"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7110 : "-"));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7111 break;
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 /* print * or hyphen -- XEmacs change to allow a buffer to be
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7114 read-only but still indicate whether it is modified. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7115 case '+':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7116 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7117 ? "*"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7118 : (!NILP (b->read_only)
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 : "-"));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7121 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7122
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7123 /* #### defined in 19.29 decode_mode_spec, but not in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7124 modeline-format doc string. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7125 /* This differs from %* in that it ignores read-only-ness. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7126 case '&':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7127 str = ((BUF_MODIFF (b) > BUF_SAVE_MODIFF (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7128 ? "*"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7129 : "-");
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7130 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7131
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7132 /* print process status */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7133 case 's':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7134 obj = Fget_buffer_process (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7135 if (NILP (obj))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7136 str = GETTEXT ("no process");
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7137 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7138 obj = Fsymbol_name (Fprocess_status (obj));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7139 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7140
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7141 /* Print name of selected frame. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7142 case 'S':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7143 obj = XFRAME (w->frame)->name;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7144 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7145
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7146 /* indicate TEXT or BINARY */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7147 case 't':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7148 /* #### NT does not use this any more. Now what? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7149 str = "T";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7150 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7151
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7152 /* 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
7153 case 'p':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7154 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7155 Charbpos pos = marker_position (w->start[type]);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7156
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7157 /* This had better be while the desired lines are being done. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7158 if (w->window_end_pos[type] <= BUF_Z (b) - BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7159 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7160 if (pos <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7161 str = "All";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7162 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7163 str = "Bottom";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7164 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7165 else if (pos <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7166 str = "Top";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7167 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7168 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7169 /* This hard limit is ok since the string it will hold has a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7170 fixed maximum length of 3. But just to be safe... */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7171 char buf[10];
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7172 Charcount chars = pos - BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7173 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7174
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7175 /* Avoid overflow on big buffers */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7176 int percent = total > LONG_MAX/200 ?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7177 (chars + total/200) / (total / 100) :
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7178 (chars * 100 + total/2) / total;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7179
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7180 /* We can't normally display a 3-digit number, so get us a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7181 2-digit number that is close. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7182 if (percent == 100)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7183 percent = 99;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7184
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7185 sprintf (buf, "%d%%", percent);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7186 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7187 strlen (buf));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7188
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7189 goto decode_mode_spec_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7190 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7191 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7192 }
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 /* print percent of buffer above bottom of window, perhaps plus
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7195 Top, or print Bottom or All */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7196 case 'P':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7197 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7198 Charbpos toppos = marker_position (w->start[type]);
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7199 Charbpos botpos = BUF_Z (b) - w->window_end_pos[type];
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7200
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7201 /* botpos is only accurate as of the last redisplay, so we can
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7202 only treat it as a hint. In particular, after erase-buffer,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7203 botpos may be negative. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7204 if (botpos < toppos)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7205 botpos = toppos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7206
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7207 if (botpos >= BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7208 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7209 if (toppos <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7210 str = "All";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7211 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7212 str = "Bottom";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7213 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7214 else
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 /* This hard limit is ok since the string it will hold has a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7217 fixed maximum length of around 6. But just to be safe... */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7218 char buf[10];
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7219 Charcount chars = botpos - BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7220 Charcount total = BUF_ZV (b) - BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7221
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7222 /* Avoid overflow on big buffers */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7223 int percent = total > LONG_MAX/200 ?
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7224 (chars + total/200) / (total / 100) :
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7225 (chars * 100 + total/2) / max (total, 1);
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 /* We can't normally display a 3-digit number, so get us a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7228 2-digit number that is close. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7229 if (percent == 100)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7230 percent = 99;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7231
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7232 if (toppos <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7233 sprintf (buf, "Top%d%%", percent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7234 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7235 sprintf (buf, "%d%%", percent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7236
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7237 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) buf,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7238 strlen (buf));
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 goto decode_mode_spec_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7241 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7242 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7243 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7244
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7245 /* print % */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7246 case '%':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7247 str = "%";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7248 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7249
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7250 /* print one [ for each recursive editing level. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7251 case '[':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7252 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7253 int i;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7254
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7255 if (command_loop_level > 5)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7256 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7257 str = "[[[... ";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7258 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7259 }
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 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
7262 Dynarr_add (mode_spec_ibyte_string, '[');
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7263
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7264 goto decode_mode_spec_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7265 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7266
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7267 /* print one ] for each recursive editing level. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7268 case ']':
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 int i;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7271
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7272 if (command_loop_level > 5)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7273 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7274 str = "...]]]";
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7275 break;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7278 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
7279 Dynarr_add (mode_spec_ibyte_string, ']');
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7280
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7281 goto decode_mode_spec_done;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7282 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7283
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7284 /* print infinitely many dashes -- handle at top level now */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7285 case '-':
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7286 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7287
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7290 if (STRINGP (obj))
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7291 Dynarr_add_many (mode_spec_ibyte_string,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7292 XSTRING_DATA (obj),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7293 XSTRING_LENGTH (obj));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7294 else if (str)
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7295 Dynarr_add_many (mode_spec_ibyte_string, (Ibyte *) str, strlen (str));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7296
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7297 decode_mode_spec_done:
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
7298 Dynarr_add (mode_spec_ibyte_string, '\0');
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7299 }
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 /* Given a display line, free all of its data structures. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7302
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7303 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7304 free_display_line (struct display_line *dl)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7305 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7306 int block;
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 if (dl->display_blocks)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7309 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7310 for (block = 0; block < Dynarr_largest (dl->display_blocks); block++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7311 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7312 struct display_block *db = Dynarr_atp (dl->display_blocks, block);
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 Dynarr_free (db->runes);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7315 }
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 Dynarr_free (dl->display_blocks);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7318 dl->display_blocks = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7319 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7320
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7321 if (dl->left_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7322 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7323 Dynarr_free (dl->left_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7324 dl->left_glyphs = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7325 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7326
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7327 if (dl->right_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7328 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7329 Dynarr_free (dl->right_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7330 dl->right_glyphs = NULL;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7331 }
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7334
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7335 /* Given an array of display lines, free them and all data structures
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7336 contained within them. */
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 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7339 free_display_lines (display_line_dynarr *dla)
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 int line;
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 for (line = 0; line < Dynarr_largest (dla); line++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7344 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7345 free_display_line (Dynarr_atp (dla, line));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7346 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7347
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7348 Dynarr_free (dla);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7351 /* Call internal free routine for each set of display lines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7352
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7353 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7354 free_display_structs (struct window_mirror *mir)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7355 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7356 if (mir->current_display_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7357 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7358 free_display_lines (mir->current_display_lines);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7359 mir->current_display_lines = 0;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7362 if (mir->desired_display_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7363 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7364 free_display_lines (mir->desired_display_lines);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7365 mir->desired_display_lines = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7366 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7367 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7368
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7369
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7370 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7371 mark_glyph_block_dynarr (glyph_block_dynarr *gba)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7372 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7373 if (gba)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7374 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7375 glyph_block *gb = Dynarr_atp (gba, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7376 glyph_block *gb_last = Dynarr_atp (gba, Dynarr_length (gba));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7377
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7378 for (; gb < gb_last; gb++)
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 (!NILP (gb->glyph))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7381 mark_object (gb->glyph);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7382 if (!NILP (gb->extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7383 mark_object (gb->extent);
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7386 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7387
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7388 /* 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
7389 the glyph will also mark the image_instance. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7390 void
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7391 mark_redisplay_structs (display_line_dynarr *dla)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7392 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7393 display_line *dl = Dynarr_atp (dla, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7394 display_line *dl_last = Dynarr_atp (dla, Dynarr_length (dla));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7395
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7396 for (; dl < dl_last; dl++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7397 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7398 display_block_dynarr *dba = dl->display_blocks;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7399 display_block *db = Dynarr_atp (dba, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7400 display_block *db_last = Dynarr_atp (dba, Dynarr_length (dba));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7401
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7402 for (; db < db_last; db++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7403 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7404 rune_dynarr *ra = db->runes;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7405 rune *r = Dynarr_atp (ra, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7406 rune *r_last = Dynarr_atp (ra, Dynarr_length (ra));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7407
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7408 for (; r < r_last; r++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7409 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7410 if (r->type == RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7411 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7412 if (!NILP (r->object.dglyph.glyph))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7413 mark_object (r->object.dglyph.glyph);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7414 if (!NILP (r->object.dglyph.extent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7415 mark_object (r->object.dglyph.extent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7416 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7417 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7418 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7419
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7420 mark_glyph_block_dynarr (dl->left_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7421 mark_glyph_block_dynarr (dl->right_glyphs);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7422 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7423 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7424
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7425
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 Line Start Cache Description and Rationale
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 The traditional scrolling code in Emacs breaks in a variable height world.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7430 It depends on the key assumption that the number of lines that can be
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7431 displayed at any given time is fixed. This led to a complete separation
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7432 of the scrolling code from the redisplay code. In order to fully support
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7433 variable height lines, the scrolling code must actually be tightly
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7434 integrated with redisplay. Only redisplay can determine how many lines
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7435 will be displayed on a screen for any given starting point.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7436
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7437 What is ideally wanted is a complete list of the starting buffer position
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7438 for every possible display line of a buffer along with the height of that
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7439 display line. Maintaining such a full list would be very expensive. We
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7440 settle for having it include information for all areas which we happen to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7441 generate anyhow (i.e. the region currently being displayed) and for those
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7442 areas we need to work with.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7443
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7444 In order to ensure that the cache accurately represents what redisplay
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7445 would actually show, it is necessary to invalidate it in many situations.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7446 If the buffer changes, the starting positions may no longer be correct.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7447 If a face or an extent has changed then the line heights may have altered.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7448 These events happen frequently enough that the cache can end up being
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7449 constantly disabled. With this potentially constant invalidation when is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7450 the cache ever useful?
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 Even if the cache is invalidated before every single usage, it is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7453 necessary. Scrolling often requires knowledge about display lines which
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7454 are actually above or below the visible region. The cache provides a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7455 convenient light-weight method of storing this information for multiple
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7456 display regions. This knowledge is necessary for the scrolling code to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7457 always obey the First Golden Rule of Redisplay.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7458
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7459 If the cache already contains all of the information that the scrolling
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7460 routines happen to need so that it doesn't have to go generate it, then we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7461 are able to obey the Third Golden Rule of Redisplay. The first thing we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7462 do to help out the cache is to always add the displayed region. This
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7463 region had to be generated anyway, so the cache ends up getting the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7464 information basically for free. In those cases where a user is simply
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7465 scrolling around viewing a buffer there is a high probability that this is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7466 sufficient to always provide the needed information. The second thing we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7467 can do is be smart about invalidating the cache.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7468
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7469 TODO -- Be smart about invalidating the cache. Potential places:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7470
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7471 + Insertions at end-of-line which don't cause line-wraps do not alter the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7472 starting positions of any display lines. These types of buffer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7473 modifications should not invalidate the cache. This is actually a large
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7474 optimization for redisplay speed as well.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7475
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7476 + Buffer modifications frequently only affect the display of lines at and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7477 below where they occur. In these situations we should only invalidate
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7478 the part of the cache starting at where the modification occurs.
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 In case you're wondering, the Second Golden Rule of Redisplay is not
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7481 applicable.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7482 ****************************************************************************/
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 /* 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
7485 allocating and freeing it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7486 static line_start_cache_dynarr *internal_cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7487
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7488 /* Makes internal_cache represent the TYPE display structs and only
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7489 the TYPE display structs. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7490
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7491 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7492 update_internal_cache_list (struct window *w, int type)
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 int line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7495 display_line_dynarr *dla = window_display_lines (w, type);
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 Dynarr_reset (internal_cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7498 for (line = 0; line < Dynarr_length (dla); line++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7499 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7500 struct display_line *dl = Dynarr_atp (dla, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7501
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7502 if (dl->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7503 continue;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7504 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7505 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7506 struct line_start_cache lsc;
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
7507
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
7508 lsc.start = dl->charpos;
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
7509 lsc.end = dl->end_charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7510 lsc.height = dl->ascent + dl->descent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7511
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7512 Dynarr_add (internal_cache, lsc);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7513 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7514 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7515 }
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 /* Reset the line cache if necessary. This should be run at the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7518 beginning of any function which access the cache. */
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 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7521 validate_line_start_cache (struct window *w)
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 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7524 struct frame *f = XFRAME (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7525
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7526 if (!w->line_cache_validation_override)
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 /* f->extents_changed used to be in here because extent face and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7529 size changes can cause text shifting. However, the extent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7530 covering the region is constantly having its face set and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7531 priority altered by the mouse code. This means that the line
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7532 start cache is constantly being invalidated. This is bad
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7533 since the mouse code also triggers heavy usage of the cache.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7534 Since it is an unlikely that f->extents being changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7535 indicates that the cache really needs to be updated and if it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7536 does redisplay will catch it pretty quickly we no longer
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7537 invalidate the cache if it is set. This greatly speeds up
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7538 dragging out regions with the mouse. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7539 if (XINT (w->line_cache_last_updated) < BUF_MODIFF (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7540 || f->faces_changed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7541 || f->clip_changed)
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_reset (w->line_start_cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7544 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7545 }
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7548 /* Return the very first buffer position contained in the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7549 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
7550 cache is valid. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7551
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7552 static Charbpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7553 line_start_cache_start (struct window *w)
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 line_start_cache_dynarr *cache = w->line_start_cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7556
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7557 if (!Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7558 return -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7559 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7560 return Dynarr_atp (cache, 0)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7561 }
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 /* Return the very last buffer position contained in the given
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7564 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
7565 cache is valid. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7566
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7567 static Charbpos
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7568 line_start_cache_end (struct window *w)
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 line_start_cache_dynarr *cache = w->line_start_cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7571
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7572 if (!Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7573 return -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7574 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7575 return Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7576 }
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 /* Return the index of the line POINT is contained within in window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7579 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
7580 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
7581 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
7582 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
7583 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
7584 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
7585 for any reason. */
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 int
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7588 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
7589 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7590 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7591 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
7592 int top, bottom, pos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7593
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7594 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7595 w->line_cache_validation_override++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7596
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7597 /* Let functions pass in negative values, but we still treat -1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7598 specially. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7599 /* #### bogosity alert */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7600 if (min_past < 0 && min_past != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7601 min_past = -min_past;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7602
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7603 if (!Dynarr_length (cache) || line_start_cache_start (w) > point
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7604 || line_start_cache_end (w) < point)
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 int loop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7607 int win_char_height = window_char_height (w, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7608
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7609 /* Occasionally we get here with a 0 height
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7610 window. find_next_newline_no_quit will abort if we pass it a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7611 count of 0 so handle that case. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7612 if (!win_char_height)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7613 win_char_height = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7614
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7615 if (!Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7616 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7617 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
7618 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
7619
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7620 update_line_start_cache (w, from, to, point, 0);
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 if (!Dynarr_length (cache))
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 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7625 return -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7626 }
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7629 assert (Dynarr_length (cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7630
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7631 loop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7632 while (line_start_cache_start (w) > point
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7633 && (loop < cache_adjustment || min_past == -1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7634 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7635 Charbpos from, to;
428
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 from = line_start_cache_start (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7638 if (from <= BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7639 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7640
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7641 from = find_next_newline_no_quit (b, from, -win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7642 to = line_start_cache_end (w);
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 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7645 loop++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7646 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7647
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7648 if (line_start_cache_start (w) > point)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7649 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7650 Charbpos from, to;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7651
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7652 from = find_next_newline_no_quit (b, point, -1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7653 if (from >= BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7654 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7655 to = find_next_newline_no_quit (b, from, -win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7656 from = to;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7657 to = BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7658 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7659 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7660 to = find_next_newline_no_quit (b, from, win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7661
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7662 update_line_start_cache (w, from, to, point, 0);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7665 loop = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7666 while (line_start_cache_end (w) < point
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7667 && (loop < cache_adjustment || min_past == -1))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7668 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7669 Charbpos from, to;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7670
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7671 to = line_start_cache_end (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7672 if (to >= BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7673 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7674
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7675 from = line_start_cache_end (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7676 to = find_next_newline_no_quit (b, from, win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7677
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7678 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7679 loop++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7680 }
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 if (line_start_cache_end (w) < point)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7683 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7684 Charbpos from, to;
428
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 from = find_next_newline_no_quit (b, point, -1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7687 if (from >= BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7688 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7689 to = find_next_newline_no_quit (b, from, -win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7690 from = to;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7691 to = BUF_ZV (b);
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7694 to = find_next_newline_no_quit (b, from, win_char_height);
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 update_line_start_cache (w, from, to, point, 0);
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7699
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7700 assert (Dynarr_length (cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7701
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7702 if (min_past == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7703 min_past = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7704
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7705 /* This could happen if the buffer is narrowed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7706 if (line_start_cache_start (w) > point
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7707 || line_start_cache_end (w) < point)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7708 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7709 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7710 return -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7711 }
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 find_point_loop:
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 top = Dynarr_length (cache) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7716 bottom = 0;
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 while (1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7719 {
647
b39c14581166 [xemacs-hg @ 2001-08-13 04:45:47 by ben]
ben
parents: 638
diff changeset
7720 int new_pos;
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7721 Charbpos start, end;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7722
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7723 pos = (bottom + top + 1) >> 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7724 start = Dynarr_atp (cache, pos)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7725 end = Dynarr_atp (cache, pos)->end;
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 (point >= start && point <= end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7728 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7729 if (pos < min_past && line_start_cache_start (w) > BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7730 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7731 Charbpos from =
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7732 find_next_newline_no_quit (b, line_start_cache_start (w),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7733 -min_past - 1);
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7734 Charbpos to = line_start_cache_end (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7735
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7736 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7737 goto find_point_loop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7738 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7739 else if ((Dynarr_length (cache) - pos - 1) < min_past
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7740 && line_start_cache_end (w) < BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7741 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7742 Charbpos from = line_start_cache_end (w);
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7743 Charbpos to = find_next_newline_no_quit (b, from,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7744 (min_past
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7745 ? min_past
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7746 : 1));
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 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7749 goto find_point_loop;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7750 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7751 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7752 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7753 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7754 return pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7755 }
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 else if (point > end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7758 bottom = pos + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7759 else if (point < start)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7760 top = pos - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7761 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7762 abort ();
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 new_pos = (bottom + top + 1) >> 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7765 if (pos == new_pos)
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 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7768 return -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7769 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7770 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7771 }
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 /* Return a boolean indicating if POINT would be visible in window W
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7774 if display of the window was to begin at STARTP. */
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
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7777 point_would_be_visible (struct window *w, Charbpos startp, Charbpos point)
428
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 struct buffer *b = XBUFFER (w->buffer);
430
a5df635868b2 Import from CVS: tag r21-2-23
cvs
parents: 428
diff changeset
7780 int pixpos = -WINDOW_TEXT_TOP_CLIP(w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7781 int bottom = WINDOW_TEXT_HEIGHT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7782 int start_elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7783
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7784 /* 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
7785 if (point < startp)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7786 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7787
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7788 /* If point or start are not in the accessible buffer range, then
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7789 fail. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7790 if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7791 || point < BUF_BEGV (b) || point > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7792 return 0;
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 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7795 w->line_cache_validation_override++;
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 start_elt = point_in_line_start_cache (w, startp, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7798 if (start_elt == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7799 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7800 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7801 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7802 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7803
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7804 assert (line_start_cache_start (w) <= startp
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7805 && line_start_cache_end (w) >= startp);
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 while (1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7808 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7809 int height;
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 /* Expand the cache if necessary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7812 if (start_elt == Dynarr_length (w->line_start_cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7813 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7814 Charbpos old_startp =
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7815 Dynarr_atp (w->line_start_cache, start_elt - 1)->start;
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 start_elt = point_in_line_start_cache (w, old_startp,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7818 window_char_height (w, 0));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7819
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7820 /* We've already actually processed old_startp, so increment
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7821 immediately. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7822 start_elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7823
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7824 /* If this happens we didn't add any extra elements. Bummer. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7825 if (start_elt == Dynarr_length (w->line_start_cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7826 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7827 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7828 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7829 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7830 }
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 height = Dynarr_atp (w->line_start_cache, start_elt)->height;
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 if (pixpos + height > bottom)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7835 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7836 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7837 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7838 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7839 return 0;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7842
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7843 pixpos += height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7844 if (point <= Dynarr_atp (w->line_start_cache, start_elt)->end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7845 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7846 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7847 return 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7848 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7849
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7850 start_elt++;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7853
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7854 /* 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
7855 the buffer position at the beginning or end of the last line
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7856 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
7857 position.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7858
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7859 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
7860 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
7861 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
7862 need to compute its location in a window. That code (in
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7863 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
7864
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7865 #### With a little work this could probably be reworked as just a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7866 call to start_with_line_at_pixpos. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7867
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7868 static Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7869 start_end_of_last_line (struct window *w, Charbpos startp, int end,
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7870 int may_error)
428
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 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7873 line_start_cache_dynarr *cache = w->line_start_cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7874 int pixpos = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7875 int bottom = WINDOW_TEXT_HEIGHT (w);
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7876 Charbpos cur_start;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7877 int start_elt;
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 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7880 w->line_cache_validation_override++;
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 if (startp < BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7883 startp = BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7884 else if (startp > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7885 startp = BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7886 cur_start = startp;
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 start_elt = point_in_line_start_cache (w, cur_start, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7889 if (start_elt == -1)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7890 return may_error ? 0 : startp;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7891
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7892 while (1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7893 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7894 int height = Dynarr_atp (cache, start_elt)->height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7895
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7896 cur_start = Dynarr_atp (cache, start_elt)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7897
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7898 if (pixpos + height > bottom)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7899 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7900 /* Adjust for any possible clip. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7901 if (bottom - pixpos < VERTICAL_CLIP (w, 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7902 start_elt--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7903
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7904 if (start_elt < 0)
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 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7907 if (end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7908 return BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7909 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7910 return BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7911 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7912 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7913 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7914 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7915 if (end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7916 return Dynarr_atp (cache, start_elt)->end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7917 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7918 return Dynarr_atp (cache, start_elt)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7919 }
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7922 pixpos += height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7923 start_elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7924 if (start_elt == Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7925 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7926 Charbpos from = line_start_cache_end (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7927 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
7928 Charbpos to = find_next_newline_no_quit (b, from,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7929 (win_char_height
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7930 ? win_char_height
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7931 : 1));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7932
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7933 /* 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
7934 if (from >= BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7935 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7936 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7937 return BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7938 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7939
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7940 update_line_start_cache (w, from, to, BUF_PT (b), 0);
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 /* Updating the cache invalidates any current indexes. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7943 start_elt = point_in_line_start_cache (w, cur_start, -1) + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7944 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7945 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7946 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7947
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7948 /* 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
7949 the buffer position at the beginning of the last line displayed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7950
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7951 Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7952 start_of_last_line (struct window *w, Charbpos startp)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7953 {
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7954 return start_end_of_last_line (w, startp, 0 , 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7955 }
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 /* 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
7958 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
7959 also know as the window end position. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7960
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7961 Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7962 end_of_last_line (struct window *w, Charbpos startp)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7963 {
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7964 return start_end_of_last_line (w, startp, 1, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7965 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7966
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7967 static Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7968 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
7969 {
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7970 return start_end_of_last_line (w, startp, 1, 1);
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7971 }
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7972
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
7973
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7974 /* 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
7975 the line containing POINT will cover pixel position PIXPOS. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7976
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7977 Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7978 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
7979 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7980 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7981 int cur_elt;
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
7982 Charbpos cur_pos, prev_pos = point;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7983 int point_line_height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7984 int pixheight = pixpos - WINDOW_TEXT_TOP (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7985
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7986 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7987 w->line_cache_validation_override++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7988
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7989 cur_elt = point_in_line_start_cache (w, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7990 /* #### See comment in update_line_start_cache about big minibuffers. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7991 if (cur_elt < 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 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7994 return point;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7995 }
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 point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7998
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7999 while (1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8000 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8001 cur_pos = Dynarr_atp (w->line_start_cache, cur_elt)->start;
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 pixheight -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8004
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8005 /* Do not take into account the value of vertical_clip here.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8006 That is the responsibility of the calling functions. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8007 if (pixheight < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8008 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8009 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8010 if (-pixheight > point_line_height)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8011 /* We can't make the target line cover pixpos, so put it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8012 above pixpos. That way it will at least be visible. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8013 return prev_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8014 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8015 return cur_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8016 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8017
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8018 cur_elt--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8019 while (cur_elt < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8020 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8021 Charbpos from, to;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8022 int win_char_height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8023
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8024 if (cur_pos <= BUF_BEGV (b))
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 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8027 return BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8028 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8029
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8030 win_char_height = window_char_height (w, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8031 if (!win_char_height)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8032 win_char_height = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8033
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8034 from = find_next_newline_no_quit (b, cur_pos, -win_char_height);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8035 to = line_start_cache_end (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8036 update_line_start_cache (w, from, to, point, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8037
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8038 cur_elt = point_in_line_start_cache (w, cur_pos, 2) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8039 assert (cur_elt >= -1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8040 /* This used to be cur_elt>=0 under the assumption that if
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8041 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
8042 setting the window_start to a newline before the start of
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8043 the first line will always cause scrolling.
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 However in my (jv) opinion this is wrong. That new line
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8046 can be hidden in various ways: invisible extents, an
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8047 explicit window-start not at a newline character etc.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8048 The existence of those are indeed known to create crashes
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8049 on that assert. So we have no option but to continue the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8050 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
8051 again. */
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 430
diff changeset
8052 cur_pos = Dynarr_atp (w->line_start_cache,0)->start;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8053 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8054 prev_pos = cur_pos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8055 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8056 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8057
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8058 /* 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
8059 the line containing point is on display line LINE. If LINE is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8060 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
8061 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
8062 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
8063 bottom line). */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8064
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8065 Charbpos
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8066 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
8067 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8068 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8069 w->line_cache_validation_override++;
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 (line >= 0)
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 int cur_elt = point_in_line_start_cache (w, point, line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8074
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8075 if (cur_elt - line < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8076 cur_elt = 0; /* Hit the top */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8077 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8078 cur_elt -= line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8079
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8080 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8081 return Dynarr_atp (w->line_start_cache, cur_elt)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8082 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8083 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8084 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8085 /* The calculated value of pixpos is correct for the bottom line
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8086 or what we want when line is -1. Therefore we subtract one
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8087 because we have already handled one line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8088 int new_line = -line - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8089 int cur_elt = point_in_line_start_cache (w, point, new_line);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8090 int pixpos = WINDOW_TEXT_BOTTOM (w);
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8091 Charbpos retval, search_point;
428
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 /* If scroll_on_clipped_lines is false, the last "visible" line of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8094 the window covers the pixel at WINDOW_TEXT_BOTTOM (w) - 1.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8095 If s_o_c_l is true, then we don't want to count a clipped
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8096 line, so back up from the bottom by the height of the line
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8097 containing point. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8098 if (scroll_on_clipped_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8099 pixpos -= Dynarr_atp (w->line_start_cache, cur_elt)->height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8100 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8101 pixpos -= 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8102
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8103 if (cur_elt + new_line >= Dynarr_length (w->line_start_cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8104 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8105 /* Hit the bottom of the buffer. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8106 int adjustment =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8107 (cur_elt + new_line) - Dynarr_length (w->line_start_cache) + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8108 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8109 int defheight;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8110
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
8111 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8112 default_face_height_and_width (window, &defheight, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8113
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8114 cur_elt = Dynarr_length (w->line_start_cache) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8115
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8116 pixpos -= (adjustment * defheight);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8117 if (pixpos < WINDOW_TEXT_TOP (w))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8118 pixpos = WINDOW_TEXT_TOP (w);
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8121 cur_elt = cur_elt + new_line;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8122
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8123 search_point = Dynarr_atp (w->line_start_cache, cur_elt)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8124
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8125 retval = start_with_line_at_pixpos (w, search_point, pixpos);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8126 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8127 return retval;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8131 /* This is used to speed up vertical scrolling by caching the known
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8132 buffer starting positions for display lines. This allows the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8133 scrolling routines to avoid costly calls to regenerate_window. If
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8134 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
8135 display structs which are in the given range.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8136
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8137 Note also that the FROM/TO values are minimums. It is possible
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8138 that this function will actually add information outside of the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8139 lines containing those positions. This can't hurt but it could
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8140 possibly help.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8141
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8142 #### We currently force the cache to have only 1 contiguous region.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8143 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
8144 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
8145 overhead for too little gain. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8146
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8147 static void
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8148 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
8149 Charbpos point, int no_regen)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8150 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8151 struct buffer *b = XBUFFER (w->buffer);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8152 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
8153 Charbpos low_bound, high_bound;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8154
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8155 validate_line_start_cache (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8156 w->line_cache_validation_override++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8157
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8158 if (from < BUF_BEGV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8159 from = BUF_BEGV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8160 if (to > BUF_ZV (b))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8161 to = BUF_ZV (b);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8162
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8163 if (from > to)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8164 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8165 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8166 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8167 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8168
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8169 if (Dynarr_length (cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8170 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8171 low_bound = line_start_cache_start (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8172 high_bound = line_start_cache_end (w);
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 /* Check to see if the desired range is already in the cache. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8175 if (from >= low_bound && to <= high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8176 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8177 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8178 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8179 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8180
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8181 /* Check to make sure that the desired range is adjacent to the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8182 current cache. If not, invalidate the cache. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8183 if (to < low_bound || from > high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8184 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8185 Dynarr_reset (cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8186 low_bound = high_bound = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8187 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8188 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8189 else
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 low_bound = high_bound = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8192 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8193
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8194 w->line_cache_last_updated = make_int (BUF_MODIFF (b));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8195
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8196 /* 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
8197 to follow what's going on by having it separate. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8198 if (no_regen)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8199 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8200 Charbpos start, end;
428
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 update_internal_cache_list (w, DESIRED_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8203 if (!Dynarr_length (internal_cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8204 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8205 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8206 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8207 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8208
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8209 start = Dynarr_atp (internal_cache, 0)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8210 end =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8211 Dynarr_atp (internal_cache, Dynarr_length (internal_cache) - 1)->end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8212
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8213 /* We aren't allowed to generate additional information to fill in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8214 gaps, so if the DESIRED structs don't overlap the cache, reset the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8215 cache. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8216 if (Dynarr_length (cache))
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 if (end < low_bound || start > high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8219 Dynarr_reset (cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8220
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8221 /* #### What should really happen if what we are doing is
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8222 extending a line (the last line)? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8223 if (Dynarr_length (cache) == 1
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8224 && Dynarr_length (internal_cache) == 1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8225 Dynarr_reset (cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8226 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8227
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8228 if (!Dynarr_length (cache))
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 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8231 Dynarr_length (internal_cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8232 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8233 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8234 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8235
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8236 /* An extra check just in case the calling function didn't pass in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8237 the bounds of the DESIRED structs in the first place. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8238 if (start >= low_bound && end <= high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8239 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8240 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8241 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8242 }
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 /* At this point we know that the internal cache partially overlaps
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8245 the main cache. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8246 if (start < low_bound)
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 int ic_elt = Dynarr_length (internal_cache) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8249 while (ic_elt >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8250 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8251 if (Dynarr_atp (internal_cache, ic_elt)->start < low_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8252 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8253 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8254 ic_elt--;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8257 if (!(ic_elt >= 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8258 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8259 Dynarr_reset (cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8260 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8261 Dynarr_length (internal_cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8262 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8263 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8264 }
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 Dynarr_insert_many_at_start (cache, Dynarr_atp (internal_cache, 0),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8267 ic_elt + 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8268 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8269
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8270 if (end > high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8271 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8272 int ic_elt = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8273
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8274 while (ic_elt < Dynarr_length (internal_cache))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8275 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8276 if (Dynarr_atp (internal_cache, ic_elt)->start > high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8277 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8278 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8279 ic_elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8280 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8281
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8282 if (!(ic_elt < Dynarr_length (internal_cache)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8283 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8284 Dynarr_reset (cache);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8285 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8286 Dynarr_length (internal_cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8287 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8288 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8289 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8290
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8291 Dynarr_add_many (cache, Dynarr_atp (internal_cache, ic_elt),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8292 Dynarr_length (internal_cache) - ic_elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8293 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8294
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8295 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8296 return;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8299 if (!Dynarr_length (cache) || from < low_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8300 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8301 Charbpos startp = find_next_newline_no_quit (b, from, -1);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8302 int marker = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8303 int old_lb = low_bound;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8304
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8305 while (startp < old_lb || low_bound == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8306 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8307 int ic_elt;
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8308 Charbpos new_startp;
428
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 regenerate_window (w, startp, point, CMOTION_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8311 update_internal_cache_list (w, CMOTION_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8312
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8313 /* If this assert is triggered then regenerate_window failed
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8314 to layout a single line. This is not possible since we
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
8315 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
8316 assert (Dynarr_length (internal_cache));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8317 assert (startp == Dynarr_atp (internal_cache, 0)->start);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8318
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8319 ic_elt = Dynarr_length (internal_cache) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8320 if (low_bound != -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8321 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8322 while (ic_elt >= 0)
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 if (Dynarr_atp (internal_cache, ic_elt)->start < old_lb)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8325 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8326 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8327 ic_elt--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8328 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8329 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8330 assert (ic_elt >= 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8331
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8332 new_startp = Dynarr_atp (internal_cache, ic_elt)->end + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8333
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8334 /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8335 * Handle invisible text properly:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8336 * If the last line we're inserting has the same end as the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8337 * line before which it will be added, merge the two lines.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8338 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8339 if (Dynarr_length (cache) &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8340 Dynarr_atp (internal_cache, ic_elt)->end ==
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8341 Dynarr_atp (cache, marker)->end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8342 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8343 Dynarr_atp (cache, marker)->start
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8344 = Dynarr_atp (internal_cache, ic_elt)->start;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8345 Dynarr_atp (cache, marker)->height
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8346 = Dynarr_atp (internal_cache, ic_elt)->height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8347 ic_elt--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8348 }
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 if (ic_elt >= 0) /* we still have lines to add.. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8351 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8352 Dynarr_insert_many (cache, Dynarr_atp (internal_cache, 0),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8353 ic_elt + 1, marker);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8354 marker += (ic_elt + 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8355 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8356
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8357 if (startp < low_bound || low_bound == -1)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8358 low_bound = startp;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8359 startp = new_startp;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8360 if (startp > BUF_ZV (b))
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 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8363 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8364 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8365 }
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8368 assert (Dynarr_length (cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8369 assert (from >= low_bound);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8370
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8371 /* Readjust the high_bound to account for any changes made while
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8372 correcting the low_bound. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8373 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
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 if (to > high_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8376 {
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8377 Charbpos startp = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end + 1;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8378
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8379 do
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 regenerate_window (w, startp, point, CMOTION_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8382 update_internal_cache_list (w, CMOTION_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8383
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8384 /* See comment above about regenerate_window failing. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8385 assert (Dynarr_length (internal_cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8386
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8387 Dynarr_add_many (cache, Dynarr_atp (internal_cache, 0),
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8388 Dynarr_length (internal_cache));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8389 high_bound = Dynarr_atp (cache, Dynarr_length (cache) - 1)->end;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8390 startp = high_bound + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8391 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8392 while (to > high_bound);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8393 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8394
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8395 w->line_cache_validation_override--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8396 assert (to <= high_bound);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8397 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8398
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8399
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8400 /* Given x and y coordinates in characters, relative to a window,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8401 return the pixel location corresponding to those coordinates. The
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8402 pixel location returned is the center of the given character
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8403 position. The pixel values are generated relative to the window,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8404 not the frame.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8405
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8406 The modeline is considered to be part of the window. */
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 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8409 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
8410 int *pix_x, int *pix_y)
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 display_line_dynarr *dla = window_display_lines (w, CURRENT_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8413 int num_disp_lines, modeline;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8414 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8415 int defheight, defwidth;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8416
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
8417 window = wrap_window (w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8418 default_face_height_and_width (window, &defheight, &defwidth);
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 /* 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
8421 the window, use the first window line or character position
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8422 instead. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8423 if (char_y < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8424 char_y = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8425 if (char_x < 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8426 char_x = 0;
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 num_disp_lines = Dynarr_length (dla);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8429 modeline = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8430 if (num_disp_lines)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8431 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8432 if (Dynarr_atp (dla, 0)->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8433 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8434 num_disp_lines--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8435 modeline = 1;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8439 /* First check if the y position intersects the display lines. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8440 if (char_y < num_disp_lines)
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 struct display_line *dl = Dynarr_atp (dla, char_y + modeline);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8443 struct display_block *db = get_display_block_from_line (dl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8444
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8445 *pix_y = (dl->ypos - dl->ascent +
647
b39c14581166 [xemacs-hg @ 2001-08-13 04:45:47 by ben]
ben
parents: 638
diff changeset
8446 ((dl->ascent + dl->descent - dl->clip) >> 1));
428
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 (char_x < Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8449 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8450 struct rune *rb = Dynarr_atp (db->runes, char_x);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8451
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8452 *pix_x = rb->xpos + (rb->width >> 1);
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 else
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 int last_rune = Dynarr_length (db->runes) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8457 struct rune *rb = Dynarr_atp (db->runes, last_rune);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8458
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8459 char_x -= last_rune;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8460
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8461 *pix_x = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8462 *pix_x += ((char_x - 1) * defwidth);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8463 *pix_x += (defwidth >> 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8464 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8465 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8466 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8467 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8468 /* It didn't intersect, so extrapolate. #### For now, we include the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8469 modeline in this since we don't have true character positions in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8470 it. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8471
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8472 if (!Dynarr_length (w->face_cachels))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8473 reset_face_cachels (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8474
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8475 char_y -= num_disp_lines;
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 if (Dynarr_length (dla))
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 struct display_line *dl = Dynarr_atp (dla, Dynarr_length (dla) - 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8480 *pix_y = dl->ypos + dl->descent - dl->clip;
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8483 *pix_y = WINDOW_TEXT_TOP (w);
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 *pix_y += (char_y * defheight);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8486 *pix_y += (defheight >> 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8487
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8488 *pix_x = WINDOW_TEXT_LEFT (w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8489 /* Don't adjust by one because this is still the unadjusted value. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8490 *pix_x += (char_x * defwidth);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8491 *pix_x += (defwidth >> 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8492 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8493
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8494 if (*pix_x > w->pixel_left + w->pixel_width)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8495 *pix_x = w->pixel_left + w->pixel_width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8496 if (*pix_y > w->pixel_top + w->pixel_height)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8497 *pix_y = w->pixel_top + w->pixel_height;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8498
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8499 *pix_x -= w->pixel_left;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8500 *pix_y -= w->pixel_top;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8503 /* 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
8504 there and return information about it if there is. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8505
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8506 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8507 get_position_object (struct display_line *dl, Lisp_Object *obj1,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8508 Lisp_Object *obj2, int x_coord, int *low_x_coord,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8509 int *high_x_coord)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8510 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8511 struct display_block *db;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8512 int elt;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8513 int block =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8514 get_next_display_block (dl->bounds, dl->display_blocks, x_coord, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8515
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8516 /* We use get_next_display_block to get the actual display block
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8517 that would be displayed at x_coord. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8518
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8519 if (block == NO_BLOCK)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8520 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8521 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8522 db = Dynarr_atp (dl->display_blocks, block);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8523
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8524 for (elt = 0; elt < Dynarr_length (db->runes); elt++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8525 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8526 struct rune *rb = Dynarr_atp (db->runes, elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8527
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8528 if (rb->xpos <= x_coord && x_coord < (rb->xpos + rb->width))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8529 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8530 if (rb->type == RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8531 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8532 *obj1 = rb->object.dglyph.glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8533 *obj2 = rb->object.dglyph.extent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8534 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8535 else
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 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8538 *obj2 = Qnil;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8541 if (low_x_coord)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8542 *low_x_coord = rb->xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8543 if (high_x_coord)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8544 *high_x_coord = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8545
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8546 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8547 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8548 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8549 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8550
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8551 #define UPDATE_CACHE_RETURN \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8552 do { \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8553 d->pixel_to_glyph_cache.valid = 1; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8554 d->pixel_to_glyph_cache.low_x_coord = low_x_coord; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8555 d->pixel_to_glyph_cache.high_x_coord = high_x_coord; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8556 d->pixel_to_glyph_cache.low_y_coord = low_y_coord; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8557 d->pixel_to_glyph_cache.high_y_coord = high_y_coord; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8558 d->pixel_to_glyph_cache.frame = f; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8559 d->pixel_to_glyph_cache.col = *col; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8560 d->pixel_to_glyph_cache.row = *row; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8561 d->pixel_to_glyph_cache.obj_x = *obj_x; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8562 d->pixel_to_glyph_cache.obj_y = *obj_y; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8563 d->pixel_to_glyph_cache.w = *w; \
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8564 d->pixel_to_glyph_cache.charpos = *charpos; \
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8565 d->pixel_to_glyph_cache.closest = *closest; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8566 d->pixel_to_glyph_cache.modeline_closest = *modeline_closest; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8567 d->pixel_to_glyph_cache.obj1 = *obj1; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8568 d->pixel_to_glyph_cache.obj2 = *obj2; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8569 d->pixel_to_glyph_cache.retval = position; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8570 RETURN_SANS_WARNINGS position; \
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8571 } while (0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8572
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8573 /* Given x and y coordinates in pixels relative to a frame, return
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8574 information about what is located under those coordinates.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8575
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8576 The return value will be one of:
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 OVER_TOOLBAR: over one of the 4 frame toolbars
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8579 OVER_MODELINE: over a modeline
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8580 OVER_BORDER: over an internal border
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8581 OVER_NOTHING: over the text area, but not over text
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8582 OVER_OUTSIDE: outside of the frame border
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8583 OVER_TEXT: over text in the text area
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8584
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8585 OBJ1 is one of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8586
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8587 -- a toolbar button
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8588 -- a glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8589 -- 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
8590
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8591 OBJ2 is one of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8592
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8593 -- 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
8594 -- nil otherwise.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8595
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8596 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
8597 equivalent coordinates relative to the upper-left corner of the glyph.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8598
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8599 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
8600 equivalent coordinates relative to the upper-left corner of the character.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8601
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8602 Otherwise, OBJ_X and OBJ_Y are undefined.
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8605 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8606 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
8607 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
8608 struct window **w, Charbpos *charpos,
665
fdefd0186b75 [xemacs-hg @ 2001-09-20 06:28:42 by ben]
ben
parents: 647
diff changeset
8609 Charbpos *closest, Charcount *modeline_closest,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8610 Lisp_Object *obj1, Lisp_Object *obj2)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8611 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8612 struct device *d;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8613 struct pixel_to_glyph_translation_cache *cache;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8614 Lisp_Object window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8615 int frm_left, frm_right, frm_top, frm_bottom;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8616 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
8617 int position = OVER_NOTHING;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8618 int device_check_failed = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8619 display_line_dynarr *dla;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8620
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8621 /* 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
8622 the middle of being deleted. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8623 if (!DEVICEP (f->device) || !DEVICE_LIVE_P (XDEVICE (f->device)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8624 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8625 device_check_failed = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8626 d = NULL, cache = NULL; /* Warning suppression */
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8629 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8630 d = XDEVICE (f->device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8631 cache = &d->pixel_to_glyph_cache;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8634 if (!device_check_failed
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8635 && cache->valid
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8636 && cache->frame == f
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8637 && cache->low_x_coord <= x_coord
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8638 && cache->high_x_coord > x_coord
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8639 && cache->low_y_coord <= y_coord
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8640 && cache->high_y_coord > y_coord)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8641 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8642 *col = cache->col;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8643 *row = cache->row;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8644 *obj_x = cache->obj_x;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8645 *obj_y = cache->obj_y;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8646 *w = cache->w;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8647 *charpos = cache->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8648 *closest = cache->closest;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8649 *modeline_closest = cache->modeline_closest;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8650 *obj1 = cache->obj1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8651 *obj2 = cache->obj2;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8652
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8653 return cache->retval;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8654 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8655 else
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 *col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8658 *row = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8659 *obj_x = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8660 *obj_y = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8661 *w = 0;
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8662 *charpos = 0;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8663 *closest = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8664 *modeline_closest = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8665 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8666 *obj2 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8667
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8668 low_x_coord = x_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8669 high_x_coord = x_coord + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8670 low_y_coord = y_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8671 high_y_coord = y_coord + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8672 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8673
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8674 if (device_check_failed)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8675 return OVER_NOTHING;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8676
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8677 frm_left = FRAME_LEFT_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8678 frm_right = FRAME_RIGHT_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8679 frm_top = FRAME_TOP_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8680 frm_bottom = FRAME_BOTTOM_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8681
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8682 /* 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
8683 redisplay. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8684 if (y_coord < frm_top)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8685 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8686 if (y_coord >= FRAME_TOP_BORDER_START (f))
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 low_y_coord = FRAME_TOP_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8689 high_y_coord = frm_top;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8690 position = OVER_BORDER;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8691 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8692 else if (y_coord >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8693 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8694 low_y_coord = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8695 high_y_coord = FRAME_TOP_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8696 position = OVER_TOOLBAR;
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 else
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 low_y_coord = y_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8701 high_y_coord = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8702 position = OVER_OUTSIDE;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8705 else if (y_coord >= frm_bottom)
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 if (y_coord < FRAME_BOTTOM_BORDER_END (f))
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 low_y_coord = frm_bottom;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8710 high_y_coord = FRAME_BOTTOM_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8711 position = OVER_BORDER;
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 else if (y_coord < FRAME_PIXHEIGHT (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8714 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8715 low_y_coord = FRAME_BOTTOM_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8716 high_y_coord = FRAME_PIXHEIGHT (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8717 position = OVER_TOOLBAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8718 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8719 else
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 low_y_coord = FRAME_PIXHEIGHT (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8722 high_y_coord = y_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8723 position = OVER_OUTSIDE;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8724 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8725 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8726
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8727 if (position != OVER_TOOLBAR && position != OVER_BORDER)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8728 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8729 if (x_coord < frm_left)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8730 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8731 if (x_coord >= FRAME_LEFT_BORDER_START (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8732 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8733 low_x_coord = FRAME_LEFT_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8734 high_x_coord = frm_left;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8735 position = OVER_BORDER;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8736 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8737 else if (x_coord >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8738 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8739 low_x_coord = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8740 high_x_coord = FRAME_LEFT_BORDER_START (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8741 position = OVER_TOOLBAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8742 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8743 else
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 low_x_coord = x_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8746 high_x_coord = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8747 position = OVER_OUTSIDE;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8748 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8749 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8750 else if (x_coord >= frm_right)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8751 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8752 if (x_coord < FRAME_RIGHT_BORDER_END (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8753 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8754 low_x_coord = frm_right;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8755 high_x_coord = FRAME_RIGHT_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8756 position = OVER_BORDER;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8757 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8758 else if (x_coord < FRAME_PIXWIDTH (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8759 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8760 low_x_coord = FRAME_RIGHT_BORDER_END (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8761 high_x_coord = FRAME_PIXWIDTH (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8762 position = OVER_TOOLBAR;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8763 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8764 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8765 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8766 low_x_coord = FRAME_PIXWIDTH (f);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8767 high_x_coord = x_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8768 position = OVER_OUTSIDE;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8769 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8770 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8771 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8772
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8773 #ifdef HAVE_TOOLBARS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8774 if (position == OVER_TOOLBAR)
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 *obj1 = toolbar_button_at_pixpos (f, x_coord, y_coord);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8777 *obj2 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8778 *w = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8779 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8780 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8781 #endif /* HAVE_TOOLBARS */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8782
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8783 /* 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
8784 relative y position even if it is outside the x boundary. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8785 if (x_coord < frm_left)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8786 x_coord = frm_left;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8787 else if (x_coord > frm_right)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8788 x_coord = frm_right;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8789
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8790 /* Same in reverse. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8791 if (y_coord < frm_top)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8792 y_coord = frm_top;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8793 else if (y_coord > frm_bottom)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8794 y_coord = frm_bottom;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8795
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8796 /* Find what window the given coordinates are actually in. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8797 window = f->root_window;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8798 *w = find_window_by_pixel_pos (x_coord, y_coord, window);
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 /* If we didn't find a window, we're done. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8801 if (!*w)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8802 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8803 UPDATE_CACHE_RETURN;
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 else if (position != OVER_NOTHING)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8806 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8807 *closest = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8808 *modeline_closest = -1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8809
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8810 if (high_y_coord <= frm_top || high_y_coord >= frm_bottom)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8811 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8812 *w = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8813 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8814 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8815 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8816
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8817 /* Check if the window is a minibuffer but isn't active. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8818 if (MINI_WINDOW_P (*w) && !minibuf_level)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8819 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8820 /* Must reset the window value since some callers will ignore
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8821 the return value if it is set. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8822 *w = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8823 UPDATE_CACHE_RETURN;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8826 /* See if the point is over window vertical divider */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8827 if (window_needs_vertical_divider (*w))
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 int div_x_high = WINDOW_RIGHT (*w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8830 int div_x_low = div_x_high - window_divider_width (*w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8831 int div_y_high = WINDOW_BOTTOM (*w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8832 int div_y_low = WINDOW_TOP (*w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8833
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8834 if (div_x_low < x_coord && x_coord <= div_x_high &&
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8835 div_y_low < y_coord && y_coord <= div_y_high)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8836 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8837 low_x_coord = div_x_low;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8838 high_x_coord = div_x_high;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8839 low_y_coord = div_y_low;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8840 high_y_coord = div_y_high;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8841 position = OVER_V_DIVIDER;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8842 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8843 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8844 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8845
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8846 dla = window_display_lines (*w, CURRENT_DISP);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8847
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8848 for (*row = 0; *row < Dynarr_length (dla); (*row)++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8849 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8850 int really_over_nothing = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8851 struct display_line *dl = Dynarr_atp (dla, *row);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8852
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8853 if ((int) (dl->ypos - dl->ascent) <= y_coord
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8854 && y_coord <= (int) (dl->ypos + dl->descent))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8855 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8856 int check_margin_glyphs = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8857 struct display_block *db = get_display_block_from_line (dl, TEXT);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8858 struct rune *rb = 0;
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 if (x_coord < dl->bounds.left_white
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8861 || x_coord >= dl->bounds.right_white)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8862 check_margin_glyphs = 1;
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 low_y_coord = dl->ypos - dl->ascent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8865 high_y_coord = dl->ypos + dl->descent + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8866
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8867 if (position == OVER_BORDER
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8868 || position == OVER_OUTSIDE
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8869 || check_margin_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8870 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8871 int x_check, left_bound;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8872
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8873 if (check_margin_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8874 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8875 x_check = x_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8876 left_bound = dl->bounds.left_white;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8877 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8878 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8879 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8880 x_check = high_x_coord;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8881 left_bound = frm_left;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8882 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8883
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8884 if (Dynarr_length (db->runes))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8885 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8886 if (x_check <= left_bound)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8887 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8888 if (dl->modeline)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8889 *modeline_closest = Dynarr_atp (db->runes, 0)->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8890 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8891 *closest = Dynarr_atp (db->runes, 0)->charpos;
428
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 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8894 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8895 if (dl->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8896 *modeline_closest =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8897 Dynarr_atp (db->runes,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8898 Dynarr_length (db->runes) - 1)->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8899 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8900 *closest =
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8901 Dynarr_atp (db->runes,
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8902 Dynarr_length (db->runes) - 1)->charpos;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8903 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8904
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8905 if (dl->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8906 *modeline_closest += dl->offset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8907 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8908 *closest += dl->offset;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8909 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8910 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8911 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8912 /* #### What should be here. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8913 if (dl->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8914 *modeline_closest = 0;
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 *closest = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8917 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8918
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8919 if (check_margin_glyphs)
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 if (x_coord < dl->bounds.left_in
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8922 || x_coord >= dl->bounds.right_in)
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 we are over the outside margins then we
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8925 know the loop over the text block isn't going
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8926 to accomplish anything. So we go ahead and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8927 set what information we can right here and
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8928 return. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8929 (*row)--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8930 *obj_y = y_coord - (dl->ypos - dl->ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8931 get_position_object (dl, obj1, obj2, x_coord,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8932 &low_x_coord, &high_x_coord);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8933
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8934 UPDATE_CACHE_RETURN;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8937 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8938 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8939 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8940
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8941 for (*col = 0; *col <= Dynarr_length (db->runes); (*col)++)
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 int past_end = (*col == Dynarr_length (db->runes));
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 if (!past_end)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8946 rb = Dynarr_atp (db->runes, *col);
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 if (past_end ||
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8949 (rb->xpos <= x_coord && x_coord < rb->xpos + rb->width))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8950 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8951 if (past_end)
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 (*col)--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8954 rb = Dynarr_atp (db->runes, *col);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8955 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8956
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8957 *charpos = rb->charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8958 low_x_coord = rb->xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8959 high_x_coord = rb->xpos + rb->width;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8960
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8961 if (rb->type == RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8962 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8963 int elt = *col + 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8964
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8965 /* Find the first character after the glyph. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8966 while (elt < Dynarr_length (db->runes))
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 if (Dynarr_atp (db->runes, elt)->type != RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8969 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8970 if (dl->modeline)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8971 *modeline_closest =
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8972 (Dynarr_atp (db->runes, elt)->charpos +
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8973 dl->offset);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8974 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8975 *closest =
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8976 (Dynarr_atp (db->runes, elt)->charpos +
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8977 dl->offset);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8978 break;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8979 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8980
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8981 elt++;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8982 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8983
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8984 /* In this case we failed to find a non-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8985 character so we return the last position
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8986 displayed on the line. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8987 if (elt == Dynarr_length (db->runes))
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 if (dl->modeline)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8990 *modeline_closest = dl->end_charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8991 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8992 *closest = dl->end_charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8993 really_over_nothing = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8994 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8995 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8996 else
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 if (dl->modeline)
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
8999 *modeline_closest = rb->charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9000 else
826
6728e641994e [xemacs-hg @ 2002-05-05 11:30:15 by ben]
ben
parents: 819
diff changeset
9001 *closest = rb->charpos + dl->offset;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9002 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9003
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9004 if (dl->modeline)
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 *row = window_displayed_height (*w);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9007
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9008 if (position == OVER_NOTHING)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9009 position = OVER_MODELINE;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9010
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9011 if (rb->type == RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9012 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9013 *obj1 = rb->object.dglyph.glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9014 *obj2 = rb->object.dglyph.extent;
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 else if (rb->type == RUNE_CHAR)
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 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9019 *obj2 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9020 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9021 else
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9022 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9023 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9024 *obj2 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9025 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9026
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9027 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9028 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9029 else if (past_end
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9030 || (rb->type == RUNE_CHAR
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9031 && rb->object.chr.ch == '\n'))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9032 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9033 (*row)--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9034 /* At this point we may have glyphs in the right
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9035 inside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9036 if (check_margin_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9037 get_position_object (dl, obj1, obj2, x_coord,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9038 &low_x_coord, &high_x_coord);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9039 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9040 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9041 else
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 (*row)--;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9044 if (rb->type == RUNE_DGLYPH)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9045 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9046 *obj1 = rb->object.dglyph.glyph;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9047 *obj2 = rb->object.dglyph.extent;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9048 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9049 else if (rb->type == RUNE_CHAR)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9050 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9051 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9052 *obj2 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9053 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9054 else
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 *obj1 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9057 *obj2 = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9058 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9059
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9060 *obj_x = x_coord - rb->xpos;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9061 *obj_y = y_coord - (dl->ypos - dl->ascent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9062
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9063 /* At this point we may have glyphs in the left
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9064 inside margin. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9065 if (check_margin_glyphs)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9066 get_position_object (dl, obj1, obj2, x_coord, 0, 0);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9067
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9068 if (position == OVER_NOTHING && !really_over_nothing)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9069 position = OVER_TEXT;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9070
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9071 UPDATE_CACHE_RETURN;
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9074 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9075 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9076 }
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 *row = Dynarr_length (dla) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9079 if (FRAME_WIN_P (f))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9080 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9081 int bot_elt = Dynarr_length (dla) - 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9082
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9083 if (bot_elt >= 0)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9084 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9085 struct display_line *dl = Dynarr_atp (dla, bot_elt);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9086 int adj_area = y_coord - (dl->ypos + dl->descent);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9087 Lisp_Object lwin;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9088 int defheight;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9089
793
e38acbeb1cae [xemacs-hg @ 2002-03-29 04:46:17 by ben]
ben
parents: 771
diff changeset
9090 lwin = wrap_window (*w);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9091 default_face_height_and_width (lwin, 0, &defheight);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9092
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9093 *row += (adj_area / defheight);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9094 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9095 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9096
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9097 /* #### This should be checked out some more to determine what
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9098 should really be going on. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9099 if (!MARKERP ((*w)->start[CURRENT_DISP]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9100 *closest = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9101 else
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9102 *closest = end_of_last_line_may_error (*w,
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9103 marker_position ((*w)->start[CURRENT_DISP]));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9104 *col = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9105 UPDATE_CACHE_RETURN;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9106 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9107 #undef UPDATE_CACHE_RETURN
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9110 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9111 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9112 /* Lisp functions */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9113 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9114 /***************************************************************************/
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 DEFUN ("redisplay-echo-area", Fredisplay_echo_area, 0, 0, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9117 Ensure that all minibuffers are correctly showing the echo area.
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 ())
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 Lisp_Object devcons, concons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9122
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9123 DEVICE_LOOP_NO_BREAK (devcons, concons)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9124 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9125 struct device *d = XDEVICE (XCAR (devcons));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9126 Lisp_Object frmcons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9127
1279
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9128 if (DEVICE_STREAM_P (d))
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9129 continue;
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9130
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9131 DEVICE_FRAME_LOOP (frmcons, d)
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 struct frame *f = XFRAME (XCAR (frmcons));
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9134 int depth;
428
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 (FRAME_REPAINT_P (f) && FRAME_HAS_MINIBUF_P (f))
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 Lisp_Object window = FRAME_MINIBUF_WINDOW (f);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9139
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9140 MAYBE_DEVMETH (d, frame_output_begin, (f));
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9141
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9142 /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9143 * If the frame size has changed, there may be random
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9144 * chud on the screen left from previous messages
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9145 * because redisplay_frame hasn't been called yet.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9146 * Clear the screen to get rid of the potential mess.
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 if (f->echo_area_garbaged)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9149 {
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9150 MAYBE_DEVMETH (d, clear_frame, (f));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9151 f->echo_area_garbaged = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9152 }
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9153 depth = enter_redisplay_critical_section ();
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9154 redisplay_window (window, 0);
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9155 exit_redisplay_critical_section (depth);
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9156 MAYBE_DEVMETH (d, frame_output_end, (f));
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9157 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9158 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9159 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9160
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9161 return Qnil;
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 DEFUN ("redraw-frame", Fredraw_frame, 0, 2, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9165 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
9166 FRAME defaults to the selected frame if omitted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9167 Normally, redisplay is preempted as normal if input arrives. However,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9168 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
9169 input and is guaranteed to proceed to completion.
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 (frame, no_preempt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9172 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9173 struct frame *f = decode_frame (frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9174 int count = specpdl_depth ();
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 (!NILP (no_preempt))
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9177 internal_bind_int (&disable_preemption, 1 + disable_preemption);
428
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 f->clear = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9180 redisplay_frame (f, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9181
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9182 /* See the comment in Fredisplay_frame. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9183 RESET_CHANGED_SET_FLAGS;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9184
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
9185 return unbind_to (count);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9186 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9187
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9188 DEFUN ("redisplay-frame", Fredisplay_frame, 0, 2, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9189 Ensure that FRAME's contents are correctly displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9190 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
9191 be updated, as opposed to unconditionally clearing and redrawing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9192 the frame.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9193 FRAME defaults to the selected frame if omitted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9194 Normally, redisplay is preempted as normal if input arrives. However,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9195 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
9196 input and is guaranteed to proceed to completion.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9197 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9198 (frame, no_preempt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9199 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9200 struct frame *f = decode_frame (frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9201 int count = specpdl_depth ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9202
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9203 if (!NILP (no_preempt))
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9204 internal_bind_int (&disable_preemption, 1 + disable_preemption);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9205
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9206 redisplay_frame (f, 1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9207
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9208 /* If we don't reset the global redisplay flags here, subsequent
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9209 changes to the display will not get registered by redisplay
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9210 because it thinks it already has registered changes. If you
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9211 really knew what you were doing you could confuse redisplay by
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9212 calling Fredisplay_frame while updating another frame. We assume
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9213 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
9214 stupid. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9215 RESET_CHANGED_SET_FLAGS;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9216
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
9217 return unbind_to (count);
428
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9220 DEFUN ("redraw-device", Fredraw_device, 0, 2, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9221 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
9222 DEVICE defaults to the selected device if omitted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9223 Normally, redisplay is preempted as normal if input arrives. However,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9224 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
9225 input and is guaranteed to proceed to completion.
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 (device, no_preempt))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9228 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9229 struct device *d = decode_device (device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9230 Lisp_Object frmcons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9231 int count = specpdl_depth ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9232
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9233 if (!NILP (no_preempt))
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9234 internal_bind_int (&disable_preemption, 1 + disable_preemption);
428
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 DEVICE_FRAME_LOOP (frmcons, d)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9237 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9238 XFRAME (XCAR (frmcons))->clear = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9239 }
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9240 redisplay_device (d, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9241
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9242 /* See the comment in Fredisplay_frame. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9243 RESET_CHANGED_SET_FLAGS;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9244
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
9245 return unbind_to (count);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9246 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9247
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9248 DEFUN ("redisplay-device", Fredisplay_device, 0, 2, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9249 Ensure that DEVICE's contents are correctly displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9250 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
9251 be updated, as opposed to unconditionally clearing and redrawing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9252 the device.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9253 DEVICE defaults to the selected device if omitted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9254 Normally, redisplay is preempted as normal if input arrives. However,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9255 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
9256 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
9257
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9258 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
9259 `(sit-for 0)'.
428
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 (device, no_preempt))
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 struct device *d = decode_device (device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9264 int count = specpdl_depth ();
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9265
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9266 if (!NILP (no_preempt))
853
2b6fa2618f76 [xemacs-hg @ 2002-05-28 08:44:22 by ben]
ben
parents: 851
diff changeset
9267 internal_bind_int (&disable_preemption, 1 + disable_preemption);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9268
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9269 redisplay_device (d, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9270
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9271 /* See the comment in Fredisplay_frame. */
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9272 RESET_CHANGED_SET_FLAGS;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9273
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
9274 return unbind_to (count);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9275 }
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 /* Big lie. Big lie. This will force all modelines to be updated
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9278 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
9279 solely for backwards compatibility. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9280 DEFUN ("redraw-modeline", Fredraw_modeline, 0, 1, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9281 Force the modeline of the current buffer to be redisplayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9282 With optional non-nil ALL, force redisplay of all modelines.
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 (all))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9285 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9286 MARK_MODELINE_CHANGED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9287 return Qnil;
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9290 DEFUN ("force-cursor-redisplay", Fforce_cursor_redisplay, 0, 1, 0, /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9291 Force an immediate update of the cursor on FRAME.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9292 FRAME defaults to the selected frame if omitted.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9293 */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9294 (frame))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9295 {
1279
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9296 struct frame *f = decode_frame (frame);
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9297
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9298 if (!FRAME_STREAM_P (f))
cd0abfdb9e9d [xemacs-hg @ 2003-02-09 09:33:42 by ben]
ben
parents: 1268
diff changeset
9299 redisplay_redraw_cursor (f, 1);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9300 return Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9301 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9302
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 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9305 /* */
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9306 /* Change flags */
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9307 /* */
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9310 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9311 margin_width_changed_in_frame (Lisp_Object specifier, struct frame *f,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9312 Lisp_Object oldval)
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 /* Nothing to be done? */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9315 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9316
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9317 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9318 redisplay_variable_changed (Lisp_Object sym, Lisp_Object *val,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9319 Lisp_Object in_object, int flags)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9320 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9321 /* #### clip_changed should really be renamed something like
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9322 global_redisplay_change. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9323 MARK_CLIP_CHANGED;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9324 return 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9325 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9326
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9327 /* This is called if the built-in glyphs have their properties
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9328 changed. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9329 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9330 redisplay_glyph_changed (Lisp_Object glyph, Lisp_Object property,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9331 Lisp_Object locale)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9332 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9333 if (WINDOWP (locale))
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 MARK_FRAME_GLYPHS_CHANGED (XFRAME (WINDOW_FRAME (XWINDOW (locale))));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9336 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9337 else if (FRAMEP (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9338 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9339 MARK_FRAME_GLYPHS_CHANGED (XFRAME (locale));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9340 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9341 else if (DEVICEP (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9342 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9343 Lisp_Object frmcons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9344 DEVICE_FRAME_LOOP (frmcons, XDEVICE (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9345 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
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 else if (CONSOLEP (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9348 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9349 Lisp_Object frmcons, devcons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9350 CONSOLE_FRAME_LOOP_NO_BREAK (frmcons, devcons, XCONSOLE (locale))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9351 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9352 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9353 else /* global or buffer */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9354 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9355 Lisp_Object frmcons, devcons, concons;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9356 FRAME_LOOP_NO_BREAK (frmcons, devcons, concons)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9357 MARK_FRAME_GLYPHS_CHANGED (XFRAME (XCAR (frmcons)));
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 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9360
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9361 static void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9362 text_cursor_visible_p_changed (Lisp_Object specifier, struct window *w,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9363 Lisp_Object oldval)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9364 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9365 if (XFRAME (w->frame)->init_finished)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9366 Fforce_cursor_redisplay (w->frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9367 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9368
872
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9369 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9370 mark_buffers_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9371 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9372 MARK_TYPE_CHANGED (buffers);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9373 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9374
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9375 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9376 mark_clip_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9377 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9378 MARK_TYPE_CHANGED (clip);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9379 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9380
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9381 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9382 mark_extents_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9383 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9384 MARK_TYPE_CHANGED (extents);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9385 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9386
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9387 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9388 mark_icon_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9389 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9390 MARK_TYPE_CHANGED (icon);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9391 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9392
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9393 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9394 mark_menubar_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9395 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9396 MARK_TYPE_CHANGED (menubar);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9397 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9398
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9399 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9400 mark_modeline_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9401 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9402 MARK_TYPE_CHANGED (modeline);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9403 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9404
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9405 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9406 mark_point_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9407 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9408 MARK_TYPE_CHANGED (point);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9409 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9410
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9411 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9412 mark_toolbar_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9413 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9414 MARK_TYPE_CHANGED (toolbar);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9415 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9416
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9417 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9418 mark_gutter_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9419 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9420 MARK_TYPE_CHANGED (gutter);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9421 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9422
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9423 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9424 mark_glyphs_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9425 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9426 MARK_TYPE_CHANGED (glyphs);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9427 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9428
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9429 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9430 mark_subwindows_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9431 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9432 MARK_TYPE_CHANGED (subwindows);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9433 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9434
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9435 void
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9436 mark_subwindows_state_changed (void)
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9437 {
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9438 MARK_TYPE_CHANGED (subwindows_state);
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9439 }
79c6ff3eef26 [xemacs-hg @ 2002-06-20 21:18:01 by ben]
ben
parents: 867
diff changeset
9440
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9441 #ifdef MEMORY_USAGE_STATS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9442
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9443
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9444 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9445 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9446 /* memory usage computation */
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 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9449
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9450 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9451 compute_rune_dynarr_usage (rune_dynarr *dyn, struct overhead_stats *ovstats)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9452 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9453 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9454 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9455
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9456 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9457 compute_display_block_dynarr_usage (display_block_dynarr *dyn,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9458 struct overhead_stats *ovstats)
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 int total, i;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9461
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9462 if (!dyn)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9463 return 0;
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 total = Dynarr_memory_usage (dyn, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9466 for (i = 0; i < Dynarr_largest (dyn); i++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9467 total += compute_rune_dynarr_usage (Dynarr_at (dyn, i).runes, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9468
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9469 return total;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9470 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9471
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9472 static int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9473 compute_glyph_block_dynarr_usage (glyph_block_dynarr *dyn,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9474 struct overhead_stats *ovstats)
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 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9477 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9478
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9479 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9480 compute_display_line_dynarr_usage (display_line_dynarr *dyn,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9481 struct overhead_stats *ovstats)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9482 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9483 int total, i;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9484
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9485 if (!dyn)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9486 return 0;
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 total = Dynarr_memory_usage (dyn, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9489 for (i = 0; i < Dynarr_largest (dyn); i++)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9490 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9491 struct display_line *dl = &Dynarr_at (dyn, i);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9492 total += compute_display_block_dynarr_usage(dl->display_blocks, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9493 total += compute_glyph_block_dynarr_usage (dl->left_glyphs, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9494 total += compute_glyph_block_dynarr_usage (dl->right_glyphs, ovstats);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9495 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9496
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9497 return total;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9498 }
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 int
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9501 compute_line_start_cache_dynarr_usage (line_start_cache_dynarr *dyn,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9502 struct overhead_stats *ovstats)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9503 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9504 return dyn ? Dynarr_memory_usage (dyn, ovstats) : 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9505 }
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 #endif /* MEMORY_USAGE_STATS */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9508
1204
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
9509 #ifdef ERROR_CHECK_DISPLAY
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
9510
800
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9511 static int
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9512 sledgehammer_check_redisplay_structs_1 (struct window *w, void *closure)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9513 {
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9514 int i, j;
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9515 display_line_dynarr *dl;
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9516
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9517 dl = window_display_lines (w, CURRENT_DISP);
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9518
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9519 for (i = 0; i < Dynarr_largest (dl); i++)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9520 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
9521 assert (Dynarr_atp (dl, i)->display_blocks !=
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9522 Dynarr_atp (dl, j)->display_blocks);
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9523
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9524 dl = window_display_lines (w, DESIRED_DISP);
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9525
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9526 for (i = 0; i < Dynarr_largest (dl); i++)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9527 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
9528 assert (Dynarr_atp (dl, i)->display_blocks !=
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9529 Dynarr_atp (dl, j)->display_blocks);
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9530
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9531 return 0;
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9532 }
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9533
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9534 static void
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9535 sledgehammer_check_redisplay_structs (void)
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9536 {
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9537 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
9538 }
a5954632b187 [xemacs-hg @ 2002-03-31 08:27:14 by ben]
ben
parents: 793
diff changeset
9539
1204
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
9540 #endif /* ERROR_CHECK_DISPLAY */
e22b0213b713 [xemacs-hg @ 2003-01-12 11:07:58 by michaels]
michaels
parents: 1123
diff changeset
9541
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9542
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9543 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9544 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9545 /* initialization */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9546 /* */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9547 /***************************************************************************/
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9548
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9549 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9550 init_redisplay (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9551 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9552 disable_preemption = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9553 preemption_count = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9554
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9555 #ifndef PDUMP
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9556 if (!initialized)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9557 #endif
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9558 {
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9559 if (!cmotion_display_lines)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9560 cmotion_display_lines = Dynarr_new (display_line);
867
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
9561 if (!mode_spec_ibyte_string)
804517e16990 [xemacs-hg @ 2002-06-05 09:54:39 by ben]
ben
parents: 853
diff changeset
9562 mode_spec_ibyte_string = Dynarr_new (Ibyte);
440
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9563 if (!formatted_string_extent_dynarr)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9564 formatted_string_extent_dynarr = Dynarr_new (EXTENT);
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9565 if (!formatted_string_extent_start_dynarr)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9566 formatted_string_extent_start_dynarr = Dynarr_new (Bytecount);
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9567 if (!formatted_string_extent_end_dynarr)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9568 formatted_string_extent_end_dynarr = Dynarr_new (Bytecount);
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9569 if (!internal_cache)
8de8e3f6228a Import from CVS: tag r21-2-28
cvs
parents: 438
diff changeset
9570 internal_cache = Dynarr_new (line_start_cache);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9571 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9572
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9573 /* window system is nil when in -batch mode */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9574 if (!initialized || noninteractive)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9575 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9576
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9577 /* 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
9578 initializing the terminal. This is especially important when the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9579 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
9580 using the window system.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9581
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9582 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
9583 with an error message if that doesn't work. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9584
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9585 #ifdef HAVE_X_WINDOWS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9586 if (!strcmp (display_use, "x"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9587 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9588 /* Some stuff checks this way early. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9589 Vwindow_system = Qx;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9590 Vinitial_window_system = Qx;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9591 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9592 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9593 #endif /* HAVE_X_WINDOWS */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9594
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9595 #ifdef HAVE_GTK
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9596 if (!strcmp (display_use, "gtk"))
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9597 {
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9598 Vwindow_system = Qgtk;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9599 Vinitial_window_system = Qgtk;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9600 return;
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9601 }
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9602 #endif
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 458
diff changeset
9603
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9604 #ifdef HAVE_MS_WINDOWS
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9605 if (!strcmp (display_use, "mswindows"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9606 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9607 /* Some stuff checks this way early. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9608 Vwindow_system = Qmswindows;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9609 Vinitial_window_system = Qmswindows;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9610 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9611 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9612 #endif /* HAVE_MS_WINDOWS */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9613
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9614 #ifdef HAVE_TTY
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9615 /* If no window system has been specified, try to use the terminal. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9616 if (!isatty (0))
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 stderr_out ("XEmacs: standard input is not a tty\n");
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9619 exit (1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9620 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9621
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9622 /* Look at the TERM variable */
771
943eaba38521 [xemacs-hg @ 2002-03-13 08:51:24 by ben]
ben
parents: 665
diff changeset
9623 if (!egetenv ("TERM"))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9624 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9625 stderr_out ("Please set the environment variable TERM; see tset(1).\n");
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9626 exit (1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9627 }
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 Vinitial_window_system = Qtty;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9630 return;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9631 #else /* not HAVE_TTY */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9632 /* No DISPLAY specified, and no TTY support. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9633 stderr_out ("XEmacs: Cannot open display.\n\
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9634 Please set the environmental variable DISPLAY to an appropriate value.\n");
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9635 exit (1);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9636 #endif
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9637 /* Unreached. */
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9640 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9641 syms_of_redisplay (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9642 {
563
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 545
diff changeset
9643 DEFSYMBOL (Qcursor_in_echo_area);
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 545
diff changeset
9644 DEFSYMBOL (Qdisplay_warning_buffer);
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 545
diff changeset
9645 DEFSYMBOL (Qbar_cursor);
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 545
diff changeset
9646 DEFSYMBOL (Qtop_bottom);
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 545
diff changeset
9647 DEFSYMBOL (Qbuffer_list_changed_hook);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9648
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9649 DEFSUBR (Fredisplay_echo_area);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9650 DEFSUBR (Fredraw_frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9651 DEFSUBR (Fredisplay_frame);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9652 DEFSUBR (Fredraw_device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9653 DEFSUBR (Fredisplay_device);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9654 DEFSUBR (Fredraw_modeline);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9655 DEFSUBR (Fforce_cursor_redisplay);
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
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9658 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9659 vars_of_redisplay (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9660 {
1292
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
9661 QSin_redisplay = build_msg_string ("(in redisplay)");
f3437b56874d [xemacs-hg @ 2003-02-13 09:57:04 by ben]
ben
parents: 1279
diff changeset
9662 staticpro (&QSin_redisplay);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9663
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9664 #if 0
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9665 staticpro (&last_arrow_position);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9666 staticpro (&last_arrow_string);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9667 last_arrow_position = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9668 last_arrow_string = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9669 #endif /* 0 */
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 /* #### Probably temporary */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9672 DEFVAR_INT ("redisplay-cache-adjustment", &cache_adjustment /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9673 \(Temporary) Setting this will impact the performance of the internal
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9674 line start cache.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9675 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9676 cache_adjustment = 2;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9677
1268
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
9678 DEFVAR_INT ("maximum-preempts", &max_preempts /*
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
9679 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
9680 */ );
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
9681 max_preempts = INIT_MAX_PREEMPTS;
fffe735e63ee [xemacs-hg @ 2003-02-07 11:50:50 by ben]
ben
parents: 1204
diff changeset
9682
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9683 DEFVAR_INT_MAGIC ("pixel-vertical-clip-threshold", &vertical_clip /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9684 Minimum pixel height for clipped bottom display line.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9685 A clipped line shorter than this won't be displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9686 */ ,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9687 redisplay_variable_changed);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9688 vertical_clip = 5;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9689
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9690 DEFVAR_INT_MAGIC ("pixel-horizontal-clip-threshold", &horizontal_clip /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9691 Minimum visible area for clipped glyphs at right boundary.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9692 Clipped glyphs shorter than this won't be displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9693 Only pixmap glyph instances are currently allowed to be clipped.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9694 */ ,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9695 redisplay_variable_changed);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9696 horizontal_clip = 5;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9697
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9698 DEFVAR_LISP ("global-mode-string", &Vglobal_mode_string /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9699 String displayed by modeline-format's "%m" specification.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9700 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9701 Vglobal_mode_string = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9702
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9703 DEFVAR_LISP_MAGIC ("overlay-arrow-position", &Voverlay_arrow_position /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9704 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
9705 This must be the beginning of a line in order to work.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9706 See also `overlay-arrow-string'.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9707 */ ,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9708 redisplay_variable_changed);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9709 Voverlay_arrow_position = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9710
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9711 DEFVAR_LISP_MAGIC ("overlay-arrow-string", &Voverlay_arrow_string /*
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9712 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
9713 \(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
9714 well as a string.)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9715 */ ,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9716 redisplay_variable_changed);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9717 Voverlay_arrow_string = Qnil;
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 DEFVAR_INT ("scroll-step", &scroll_step /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9720 *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
9721 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
9722 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
9723 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9724 scroll_step = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9725
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9726 DEFVAR_INT ("scroll-conservatively", &scroll_conservatively /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9727 *Scroll up to this many lines, to bring point back on screen.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9728 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9729 scroll_conservatively = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9730
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9731 DEFVAR_BOOL_MAGIC ("truncate-partial-width-windows",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9732 &truncate_partial_width_windows /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9733 *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
9734 */ ,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9735 redisplay_variable_changed);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9736 truncate_partial_width_windows = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9737
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9738 DEFVAR_LISP ("visible-bell", &Vvisible_bell /*
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9739 *Non-nil substitutes a visual signal for the audible bell.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9740
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9741 Default behavior is to flash the whole screen. On some platforms,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9742 special effects are available using the following values:
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9743
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9744 'display Flash the whole screen (ie, the default behavior).
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9745 'top-bottom Flash only the top and bottom lines of the selected frame.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9746
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9747 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
9748 default, whole screen. (Currently only X supports any special effects.)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9749 */ );
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9750 Vvisible_bell = Qnil;
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9751
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9752 DEFVAR_BOOL ("no-redraw-on-reenter", &no_redraw_on_reenter /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9753 *Non-nil means no need to redraw entire frame after suspending.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9754 A non-nil value is useful if the terminal can automatically preserve
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9755 Emacs's frame display when you reenter Emacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9756 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
9757 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9758 no_redraw_on_reenter = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9759
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9760 DEFVAR_LISP ("window-system", &Vwindow_system /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9761 A symbol naming the window-system under which Emacs is running,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9762 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
9763
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9764 Do not use this variable, except for GNU Emacs compatibility, as it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9765 gives wrong values in a multi-device environment. Use `console-type'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9766 instead.
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 Vwindow_system = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9769
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9770 /* #### Temporary shit until window-system is eliminated. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9771 DEFVAR_CONST_LISP ("initial-window-system", &Vinitial_window_system /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9772 DON'T TOUCH
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9773 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9774 Vinitial_window_system = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9775
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9776 DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9777 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
9778 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9779 cursor_in_echo_area = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9780
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9781 /* #### Shouldn't this be generalized as follows:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9782
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9783 if nil, use block cursor.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9784 if a number, use a bar cursor of that width.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9785 Otherwise, use a 1-pixel bar cursor.
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 #### Or better yet, this variable should be trashed entirely
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9788 (use a Lisp-magic variable to maintain compatibility)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9789 and a specifier `cursor-shape' added, which allows a block
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9790 cursor, a bar cursor, a flashing block or bar cursor,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9791 maybe a caret cursor, etc. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9792
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9793 DEFVAR_LISP ("bar-cursor", &Vbar_cursor /*
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents: 444
diff changeset
9794 *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
9795 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9796 Vbar_cursor = Qnil;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9797
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9798 DEFVAR_LISP ("buffer-list-changed-hook", &Vbuffer_list_changed_hook /*
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9799 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
9800 This is called during redisplay, before redisplaying each frame.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9801 Functions on this hook are called with one argument, the frame.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9802 */ );
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9803 Vbuffer_list_changed_hook = Qnil;
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 440
diff changeset
9804
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9805 DEFVAR_INT ("display-warning-tick", &display_warning_tick /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9806 Bump this to tell the C code to call `display-warning-buffer'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9807 at next redisplay. You should not normally change this; the function
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9808 `display-warning' automatically does this at appropriate times.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9809 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9810 display_warning_tick = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9811
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9812 DEFVAR_BOOL ("inhibit-warning-display", &inhibit_warning_display /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9813 Non-nil means inhibit display of warning messages.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9814 You should *bind* this, not set it. Any pending warning messages
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9815 will be displayed when the binding no longer applies.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9816 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9817 /* reset to 0 by startup.el after the splash screen has displayed.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9818 This way, the warnings don't obliterate the splash screen. */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9819 inhibit_warning_display = 1;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9820
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9821 DEFVAR_BOOL ("column-number-start-at-one", &column_number_start_at_one /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9822 *Non-nil means column display number starts at 1.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9823 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9824 column_number_start_at_one = 0;
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9825 }
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9826
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9827 void
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9828 specifier_vars_of_redisplay (void)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9829 {
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9830 DEFVAR_SPECIFIER ("left-margin-width", &Vleft_margin_width /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9831 *Width of left margin.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9832 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9833 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9834 Vleft_margin_width = Fmake_specifier (Qnatnum);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9835 set_specifier_fallback (Vleft_margin_width, list1 (Fcons (Qnil, Qzero)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9836 set_specifier_caching (Vleft_margin_width,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
9837 offsetof (struct window, left_margin_width),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9838 some_window_value_changed,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
9839 offsetof (struct frame, left_margin_width),
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
9840 margin_width_changed_in_frame, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9841
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9842 DEFVAR_SPECIFIER ("right-margin-width", &Vright_margin_width /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9843 *Width of right margin.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9844 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9845 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9846 Vright_margin_width = Fmake_specifier (Qnatnum);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9847 set_specifier_fallback (Vright_margin_width, list1 (Fcons (Qnil, Qzero)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9848 set_specifier_caching (Vright_margin_width,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
9849 offsetof (struct window, right_margin_width),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9850 some_window_value_changed,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
9851 offsetof (struct frame, right_margin_width),
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
9852 margin_width_changed_in_frame, 0);
428
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 DEFVAR_SPECIFIER ("minimum-line-ascent", &Vminimum_line_ascent /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9855 *Minimum ascent height of lines.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9856 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9857 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9858 Vminimum_line_ascent = Fmake_specifier (Qnatnum);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9859 set_specifier_fallback (Vminimum_line_ascent, list1 (Fcons (Qnil, Qzero)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9860 set_specifier_caching (Vminimum_line_ascent,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
9861 offsetof (struct window, minimum_line_ascent),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9862 some_window_value_changed,
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
9863 0, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9864
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9865 DEFVAR_SPECIFIER ("minimum-line-descent", &Vminimum_line_descent /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9866 *Minimum descent height of lines.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9867 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9868 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9869 Vminimum_line_descent = Fmake_specifier (Qnatnum);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9870 set_specifier_fallback (Vminimum_line_descent, list1 (Fcons (Qnil, Qzero)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9871 set_specifier_caching (Vminimum_line_descent,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
9872 offsetof (struct window, minimum_line_descent),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9873 some_window_value_changed,
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
9874 0, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9875
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9876 DEFVAR_SPECIFIER ("use-left-overflow", &Vuse_left_overflow /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9877 *Non-nil means use the left outside margin as extra whitespace when
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9878 displaying 'whitespace or 'inside-margin glyphs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9879 This is a specifier; use `set-specifier' to change it.
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 Vuse_left_overflow = Fmake_specifier (Qboolean);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9882 set_specifier_fallback (Vuse_left_overflow, list1 (Fcons (Qnil, Qnil)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9883 set_specifier_caching (Vuse_left_overflow,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
9884 offsetof (struct window, use_left_overflow),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9885 some_window_value_changed,
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
9886 0, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9887
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9888 DEFVAR_SPECIFIER ("use-right-overflow", &Vuse_right_overflow /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9889 *Non-nil means use the right outside margin as extra whitespace when
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9890 displaying 'whitespace or 'inside-margin glyphs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9891 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9892 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9893 Vuse_right_overflow = Fmake_specifier (Qboolean);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9894 set_specifier_fallback (Vuse_right_overflow, list1 (Fcons (Qnil, Qnil)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9895 set_specifier_caching (Vuse_right_overflow,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
9896 offsetof (struct window, use_right_overflow),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9897 some_window_value_changed,
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
9898 0, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9899
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9900 DEFVAR_SPECIFIER ("text-cursor-visible-p", &Vtext_cursor_visible_p /*
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9901 *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
9902 This is a specifier; use `set-specifier' to change it.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9903 */ );
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9904 Vtext_cursor_visible_p = Fmake_specifier (Qboolean);
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9905 set_specifier_fallback (Vtext_cursor_visible_p, list1 (Fcons (Qnil, Qt)));
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9906 set_specifier_caching (Vtext_cursor_visible_p,
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
9907 offsetof (struct window, text_cursor_visible_p),
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9908 text_cursor_visible_p_changed,
444
576fb035e263 Import from CVS: tag r21-2-37
cvs
parents: 442
diff changeset
9909 0, 0, 0);
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9910
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9911 }